From 6269e826598371fd7683dca5089df17536161f14 Mon Sep 17 00:00:00 2001 From: robojumper Date: Mon, 17 Feb 2025 13:19:48 +0100 Subject: [PATCH] Move missing Ghidra symbols from REL data to decomp symbols (#116) --- .../rels/d_SoftwareKeyboardNP/symbols.txt | 4 +- .../rels/d_a_avater_race_mngNP/symbols.txt | 2 +- config/SOUE01/rels/d_a_b_asuraNP/symbols.txt | 30 +++--- .../rels/d_a_b_girahimu3_secondNP/symbols.txt | 2 +- .../SOUE01/rels/d_a_b_girahimuNP/symbols.txt | 16 +-- .../rels/d_a_b_girahimu_baseNP/symbols.txt | 52 +++++----- config/SOUE01/rels/d_a_b_krNP/symbols.txt | 12 +-- config/SOUE01/rels/d_a_b_nusiNP/symbols.txt | 2 +- config/SOUE01/rels/d_a_b_vdNP/symbols.txt | 18 ++-- config/SOUE01/rels/d_a_birdNP/symbols.txt | 22 ++--- config/SOUE01/rels/d_a_bombfNP/symbols.txt | 2 +- config/SOUE01/rels/d_a_co_testNP/symbols.txt | 6 +- config/SOUE01/rels/d_a_controlNP/symbols.txt | 6 +- .../rels/d_a_e_battleshipfishNP/symbols.txt | 2 +- config/SOUE01/rels/d_a_e_bcNP/symbols.txt | 26 ++--- config/SOUE01/rels/d_a_e_beamosNP/symbols.txt | 2 +- config/SOUE01/rels/d_a_e_bsNP/symbols.txt | 16 +-- .../SOUE01/rels/d_a_e_captainNP/symbols.txt | 2 +- config/SOUE01/rels/d_a_e_gueNP/symbols.txt | 14 +-- config/SOUE01/rels/d_a_e_gumarmNP/symbols.txt | 30 +++--- config/SOUE01/rels/d_a_e_gunhobNP/symbols.txt | 2 +- config/SOUE01/rels/d_a_e_hydraNP/symbols.txt | 4 +- config/SOUE01/rels/d_a_e_ksNP/symbols.txt | 24 ++--- config/SOUE01/rels/d_a_e_phNP/symbols.txt | 6 +- .../SOUE01/rels/d_a_e_rupee_gueNP/symbols.txt | 2 +- config/SOUE01/rels/d_a_e_stNP/symbols.txt | 42 ++++---- config/SOUE01/rels/d_a_e_wsNP/symbols.txt | 14 +-- config/SOUE01/rels/d_a_heartfNP/symbols.txt | 2 +- .../rels/d_a_insect_grasshopperNP/symbols.txt | 2 +- config/SOUE01/rels/d_a_messageNP/symbols.txt | 2 +- .../SOUE01/rels/d_a_morita_testNP/symbols.txt | 2 +- .../rels/d_a_npc_akumakunNP/symbols.txt | 2 +- .../rels/d_a_npc_aqua_dragonNP/symbols.txt | 2 +- .../rels/d_a_npc_bamboo_goronNP/symbols.txt | 2 +- .../SOUE01/rels/d_a_npc_bbrvlNP/symbols.txt | 44 ++++----- config/SOUE01/rels/d_a_npc_beeNP/symbols.txt | 2 +- .../rels/d_a_npc_bird_sowomanNP/symbols.txt | 2 +- .../rels/d_a_npc_desertrobotNP/symbols.txt | 2 +- .../d_a_npc_dive_game_judgeNP/symbols.txt | 12 +-- .../rels/d_a_npc_douguyanightNP/symbols.txt | 2 +- .../rels/d_a_npc_honeycombNP/symbols.txt | 2 +- .../symbols.txt | 4 +- .../SOUE01/rels/d_a_npc_kenseiNP/symbols.txt | 14 +-- .../SOUE01/rels/d_a_npc_kobunNP/symbols.txt | 2 +- .../SOUE01/rels/d_a_npc_kyui4NP/symbols.txt | 12 +-- .../rels/d_a_npc_kyui_elderNP/symbols.txt | 8 +- .../rels/d_a_npc_kyui_thirdNP/symbols.txt | 8 +- config/SOUE01/rels/d_a_npc_moleNP/symbols.txt | 8 +- .../rels/d_a_npc_mole_normalNP/symbols.txt | 2 +- .../rels/d_a_npc_ord_kyuiNP/symbols.txt | 2 +- .../symbols.txt | 12 +-- .../SOUE01/rels/d_a_npc_rescueNP/symbols.txt | 2 +- .../SOUE01/rels/d_a_npc_rivalNP/symbols.txt | 2 +- .../rels/d_a_npc_salbage_robotNP/symbols.txt | 12 +-- .../d_a_npc_salbage_robot_flyNP/symbols.txt | 10 +- .../symbols.txt | 4 +- .../rels/d_a_npc_salesman_sNP/symbols.txt | 58 +++++------ .../rels/d_a_npc_sorajima_maleNP/symbols.txt | 4 +- .../SOUE01/rels/d_a_npc_testmanNP/symbols.txt | 2 +- .../rels/d_a_npc_thunder_dragonNP/symbols.txt | 6 +- .../rels/d_a_obj_B300_sandNP/symbols.txt | 6 +- config/SOUE01/rels/d_a_obj_D300NP/symbols.txt | 8 +- .../rels/d_a_obj_F400_gate_sealNP/symbols.txt | 2 +- .../rels/d_a_obj_ancient_jewelsNP/symbols.txt | 12 +-- .../rels/d_a_obj_appear_bridgeNP/symbols.txt | 2 +- .../rels/d_a_obj_ballistaNP/symbols.txt | 14 +-- .../rels/d_a_obj_ballista_f3NP/symbols.txt | 14 +-- .../SOUE01/rels/d_a_obj_bambooNP/symbols.txt | 2 +- .../rels/d_a_obj_bamboo_islandNP/symbols.txt | 4 +- .../rels/d_a_obj_bb_bridgeNP/symbols.txt | 6 +- .../d_a_obj_bb_broken_partsNP/symbols.txt | 8 +- .../rels/d_a_obj_bb_objectsNP/symbols.txt | 6 +- .../rels/d_a_obj_bblargebombNP/symbols.txt | 12 +-- config/SOUE01/rels/d_a_obj_bellNP/symbols.txt | 10 +- .../rels/d_a_obj_belt_cvrNP/symbols.txt | 4 +- .../rels/d_a_obj_belt_obstacleNP/symbols.txt | 14 +-- config/SOUE01/rels/d_a_obj_bgNP/symbols.txt | 2 +- .../SOUE01/rels/d_a_obj_bird_spNP/symbols.txt | 4 +- .../rels/d_a_obj_blast_rockNP/symbols.txt | 2 +- .../rels/d_a_obj_block_ropeNP/symbols.txt | 12 +-- .../d_a_obj_block_undergroundNP/symbols.txt | 2 +- config/SOUE01/rels/d_a_obj_boatNP/symbols.txt | 14 +-- .../rels/d_a_obj_bridge_boneNP/symbols.txt | 4 +- .../d_a_obj_bridge_buildingNP/symbols.txt | 12 +-- .../rels/d_a_obj_bridge_fallNP/symbols.txt | 8 +- .../rels/d_a_obj_bridge_stepNP/symbols.txt | 10 +- .../rels/d_a_obj_bridge_stretchNP/symbols.txt | 8 +- .../rels/d_a_obj_bridge_timeNP/symbols.txt | 10 +- .../SOUE01/rels/d_a_obj_bstoneNP/symbols.txt | 2 +- .../rels/d_a_obj_bulb_switchNP/symbols.txt | 8 +- .../SOUE01/rels/d_a_obj_cannonNP/symbols.txt | 14 +-- .../rels/d_a_obj_cannon_coverNP/symbols.txt | 14 +-- .../SOUE01/rels/d_a_obj_chairNP/symbols.txt | 4 +- .../rels/d_a_obj_chandelierNP/symbols.txt | 10 +- .../SOUE01/rels/d_a_obj_chestNP/symbols.txt | 14 +-- config/SOUE01/rels/d_a_obj_cityNP/symbols.txt | 2 +- .../rels/d_a_obj_city_waterNP/symbols.txt | 2 +- .../rels/d_a_obj_claw_shot_tgNP/symbols.txt | 8 +- config/SOUE01/rels/d_a_obj_clefNP/symbols.txt | 12 +-- .../rels/d_a_obj_control_panelNP/symbols.txt | 10 +- .../rels/d_a_obj_daynightNP/symbols.txt | 4 +- .../SOUE01/rels/d_a_obj_desertNP/symbols.txt | 2 +- .../rels/d_a_obj_desert_agoNP/symbols.txt | 4 +- .../rels/d_a_obj_desert_debrisNP/symbols.txt | 2 +- .../rels/d_a_obj_desert_meterNP/symbols.txt | 6 +- .../rels/d_a_obj_distant_shipNP/symbols.txt | 2 +- config/SOUE01/rels/d_a_obj_doorNP/symbols.txt | 4 +- .../rels/d_a_obj_door_bossNP/symbols.txt | 24 ++--- .../d_a_obj_door_dungeonD200NP/symbols.txt | 6 +- .../rels/d_a_obj_door_dungeonNP/symbols.txt | 4 +- .../rels/d_a_obj_dormitory_gateNP/symbols.txt | 2 +- .../rels/d_a_obj_down_lavaNP/symbols.txt | 6 +- config/SOUE01/rels/d_a_obj_drumNP/symbols.txt | 16 +-- .../rels/d_a_obj_dungeon_shipNP/symbols.txt | 12 +-- .../rels/d_a_obj_evil_fieldNP/symbols.txt | 8 +- .../rels/d_a_obj_farmlandNP/symbols.txt | 6 +- .../rels/d_a_obj_fence_boko2NP/symbols.txt | 2 +- .../rels/d_a_obj_fence_bokoNP/symbols.txt | 2 +- .../rels/d_a_obj_fence_ironNP/symbols.txt | 18 ++-- .../rels/d_a_obj_fence_konsaiNP/symbols.txt | 2 +- config/SOUE01/rels/d_a_obj_fireNP/symbols.txt | 2 +- .../symbols.txt | 2 +- .../rels/d_a_obj_fortune_ringNP/symbols.txt | 8 +- .../SOUE01/rels/d_a_obj_fruitBNP/symbols.txt | 10 +- .../d_a_obj_fruit_guts_leafNP/symbols.txt | 8 +- .../rels/d_a_obj_fruit_treeNP/symbols.txt | 2 +- config/SOUE01/rels/d_a_obj_gearNP/symbols.txt | 10 +- .../rels/d_a_obj_girahimu_floorNP/symbols.txt | 8 +- .../rels/d_a_obj_girahimu_knifeNP/symbols.txt | 12 +-- .../d_a_obj_girahimu_sword_linkNP/symbols.txt | 16 +-- .../rels/d_a_obj_goddess_cubeNP/symbols.txt | 6 +- .../rels/d_a_obj_goddess_statueNP/symbols.txt | 6 +- .../SOUE01/rels/d_a_obj_graveNP/symbols.txt | 2 +- .../rels/d_a_obj_ground_coverNP/symbols.txt | 10 +- .../rels/d_a_obj_harp_hintNP/symbols.txt | 12 +-- config/SOUE01/rels/d_a_obj_himoNP/symbols.txt | 6 +- .../rels/d_a_obj_hit_lever_swNP/symbols.txt | 8 +- .../rels/d_a_obj_hole_minigameNP/symbols.txt | 12 +-- .../rels/d_a_obj_insect_islandNP/symbols.txt | 2 +- .../rels/d_a_obj_iron_stageNP/symbols.txt | 2 +- .../rels/d_a_obj_island_LODNP/symbols.txt | 6 +- .../rels/d_a_obj_island_nusiNP/symbols.txt | 4 +- .../symbols.txt | 18 ++-- .../rels/d_a_obj_ivy_ropeNP/symbols.txt | 10 +- .../rels/d_a_obj_junk_repairingNP/symbols.txt | 2 +- .../SOUE01/rels/d_a_obj_kibakoNP/symbols.txt | 14 +-- .../rels/d_a_obj_kumite_wallNP/symbols.txt | 6 +- .../rels/d_a_obj_lava_plateNP/symbols.txt | 6 +- .../rels/d_a_obj_leaf_swingNP/symbols.txt | 4 +- .../rels/d_a_obj_light_lineNP/symbols.txt | 6 +- .../d_a_obj_lighthouse_harpNP/symbols.txt | 10 +- .../d_a_obj_lighthouse_lightNP/symbols.txt | 8 +- config/SOUE01/rels/d_a_obj_logNP/symbols.txt | 12 +-- .../rels/d_a_obj_log_waterNP/symbols.txt | 6 +- .../SOUE01/rels/d_a_obj_lotusNP/symbols.txt | 10 +- .../rels/d_a_obj_megami_islandNP/symbols.txt | 2 +- .../rels/d_a_obj_mole_coverNP/symbols.txt | 2 +- .../rels/d_a_obj_mole_soilNP/symbols.txt | 2 +- .../rels/d_a_obj_move_lift_volNP/symbols.txt | 12 +-- .../rels/d_a_obj_mushroomNP/symbols.txt | 2 +- .../rels/d_a_obj_needle_desertNP/symbols.txt | 6 +- .../d_a_obj_needle_undergroundNP/symbols.txt | 6 +- .../rels/d_a_obj_oct_grassNP/symbols.txt | 8 +- .../rels/d_a_obj_oct_grass_leafNP/symbols.txt | 10 +- .../SOUE01/rels/d_a_obj_paintNP/symbols.txt | 4 +- .../rels/d_a_obj_pinwheelNP/symbols.txt | 10 +- .../SOUE01/rels/d_a_obj_pot_salNP/symbols.txt | 2 +- .../SOUE01/rels/d_a_obj_properaNP/symbols.txt | 2 +- .../rels/d_a_obj_pumpkin_barNP/symbols.txt | 2 +- .../rels/d_a_obj_push_blockNP/symbols.txt | 12 +-- .../rels/d_a_obj_puzzle_islandNP/symbols.txt | 2 +- .../rels/d_a_obj_rail_endNP/symbols.txt | 2 +- .../rels/d_a_obj_rail_postNP/symbols.txt | 2 +- .../rels/d_a_obj_ride_rockNP/symbols.txt | 12 +-- .../rels/d_a_obj_rock_boatNP/symbols.txt | 12 +-- .../rels/d_a_obj_rock_dragonNP/symbols.txt | 10 +- .../rels/d_a_obj_rock_skyNP/symbols.txt | 2 +- .../rels/d_a_obj_roll_pillarNP/symbols.txt | 4 +- .../rels/d_a_obj_rotation_lightNP/symbols.txt | 2 +- .../rels/d_a_obj_rouletteNP/symbols.txt | 2 +- .../d_a_obj_roulette_island_cNP/symbols.txt | 8 +- .../d_a_obj_roulette_island_rNP/symbols.txt | 8 +- .../rels/d_a_obj_sand_floorNP/symbols.txt | 4 +- .../SOUE01/rels/d_a_obj_sandbagNP/symbols.txt | 4 +- config/SOUE01/rels/d_a_obj_saveNP/symbols.txt | 14 +-- .../rels/d_a_obj_sea_F301NP/symbols.txt | 4 +- .../rels/d_a_obj_sealed_doorNP/symbols.txt | 18 ++-- .../rels/d_a_obj_seat_swordNP/symbols.txt | 2 +- config/SOUE01/rels/d_a_obj_shedNP/symbols.txt | 6 +- .../rels/d_a_obj_ship_windowNP/symbols.txt | 8 +- .../rels/d_a_obj_shrine_afterNP/symbols.txt | 2 +- .../d_a_obj_shrine_bef_insideNP/symbols.txt | 4 +- .../rels/d_a_obj_shrine_beforeNP/symbols.txt | 2 +- .../SOUE01/rels/d_a_obj_shutterNP/symbols.txt | 6 +- .../rels/d_a_obj_shutter_fenceNP/symbols.txt | 6 +- .../rels/d_a_obj_side_shutterNP/symbols.txt | 14 +-- .../rels/d_a_obj_sink_floor_fNP/symbols.txt | 10 +- .../SOUE01/rels/d_a_obj_smokeNP/symbols.txt | 16 +-- config/SOUE01/rels/d_a_obj_soilNP/symbols.txt | 8 +- .../rels/d_a_obj_spider_lineNP/symbols.txt | 6 +- .../rels/d_a_obj_stage_crackNP/symbols.txt | 10 +- .../rels/d_a_obj_stage_krakenNP/symbols.txt | 12 +-- .../d_a_obj_stage_kraken_partsNP/symbols.txt | 10 +- .../rels/d_a_obj_stage_sinkNP/symbols.txt | 8 +- .../rels/d_a_obj_stage_waterNP/symbols.txt | 8 +- .../rels/d_a_obj_step_gumarmNP/symbols.txt | 2 +- .../rels/d_a_obj_step_statueNP/symbols.txt | 12 +-- .../rels/d_a_obj_step_time_slipNP/symbols.txt | 4 +- .../rels/d_a_obj_stone_standNP/symbols.txt | 6 +- .../rels/d_a_obj_stopper_rockNP/symbols.txt | 8 +- .../rels/d_a_obj_stream_lavaNP/symbols.txt | 6 +- .../SOUE01/rels/d_a_obj_sw_bankNP/symbols.txt | 8 +- .../SOUE01/rels/d_a_obj_sw_dirNP/symbols.txt | 8 +- .../rels/d_a_obj_sw_dir_doorNP/symbols.txt | 10 +- .../SOUE01/rels/d_a_obj_sw_harpNP/symbols.txt | 8 +- .../rels/d_a_obj_sw_sword_beamNP/symbols.txt | 12 +-- .../rels/d_a_obj_sw_syakoNP/symbols.txt | 6 +- .../rels/d_a_obj_switch_shutterNP/symbols.txt | 4 +- .../rels/d_a_obj_switch_wallNP/symbols.txt | 6 +- .../rels/d_a_obj_sword_candleNP/symbols.txt | 4 +- .../rels/d_a_obj_swrd_prjNP/symbols.txt | 10 +- .../rels/d_a_obj_syako_shutterNP/symbols.txt | 8 +- .../rels/d_a_obj_tarzan_poleNP/symbols.txt | 2 +- .../rels/d_a_obj_teni_railNP/symbols.txt | 2 +- .../rels/d_a_obj_teni_rail_postNP/symbols.txt | 2 +- .../rels/d_a_obj_terry_islandNP/symbols.txt | 6 +- .../rels/d_a_obj_terry_shopNP/symbols.txt | 8 +- .../rels/d_a_obj_time_baseNP/symbols.txt | 2 +- .../rels/d_a_obj_time_boatNP/symbols.txt | 10 +- .../d_a_obj_time_door_beforeNP/symbols.txt | 2 +- .../rels/d_a_obj_time_stoneNP/symbols.txt | 8 +- .../rels/d_a_obj_toge_trapNP/symbols.txt | 6 +- .../SOUE01/rels/d_a_obj_tornadoNP/symbols.txt | 4 +- .../rels/d_a_obj_tower_D101NP/symbols.txt | 4 +- .../rels/d_a_obj_tower_bombNP/symbols.txt | 2 +- .../d_a_obj_treasure_islandNP/symbols.txt | 2 +- .../d_a_obj_treasure_island_bNP/symbols.txt | 8 +- .../rels/d_a_obj_triforceNP/symbols.txt | 2 +- .../SOUE01/rels/d_a_obj_trolleyNP/symbols.txt | 28 +++--- .../SOUE01/rels/d_a_obj_truckNP/symbols.txt | 10 +- .../rels/d_a_obj_truck_rail_colNP/symbols.txt | 2 +- .../rels/d_a_obj_truck_stopperNP/symbols.txt | 6 +- .../rels/d_a_obj_undergroundNP/symbols.txt | 2 +- .../rels/d_a_obj_updown_lavaNP/symbols.txt | 10 +- .../d_a_obj_uta_demo_pedestNP/symbols.txt | 4 +- .../SOUE01/rels/d_a_obj_utajimaNP/symbols.txt | 2 +- .../rels/d_a_obj_utajima_lv2NP/symbols.txt | 2 +- .../d_a_obj_utajima_main_mechaNP/symbols.txt | 8 +- .../d_a_obj_utajima_pedestalNP/symbols.txt | 8 +- .../d_a_obj_utajima_stopperNP/symbols.txt | 12 +-- config/SOUE01/rels/d_a_obj_warpNP/symbols.txt | 16 +-- .../rels/d_a_obj_warp_holeNP/symbols.txt | 2 +- .../rels/d_a_obj_water_F100NP/symbols.txt | 2 +- .../rels/d_a_obj_water_jarNP/symbols.txt | 2 +- .../rels/d_a_obj_water_surfaceNP/symbols.txt | 8 +- .../rels/d_a_obj_waterfall_D100NP/symbols.txt | 8 +- .../rels/d_a_obj_waterfall_D101NP/symbols.txt | 4 +- .../SOUE01/rels/d_a_obj_wind02NP/symbols.txt | 10 +- .../SOUE01/rels/d_a_obj_wind03NP/symbols.txt | 4 +- .../SOUE01/rels/d_a_obj_wind04NP/symbols.txt | 2 +- config/SOUE01/rels/d_a_obj_windNP/symbols.txt | 4 +- .../rels/d_a_obj_windmillNP/symbols.txt | 12 +-- .../d_a_obj_windmill_desertNP/symbols.txt | 12 +-- .../rels/d_a_obj_wood_boardNP/symbols.txt | 6 +- .../SOUE01/rels/d_a_shop_sampleNP/symbols.txt | 44 ++++----- .../SOUE01/rels/d_a_t_wood_areaNP/symbols.txt | 4 +- .../rels/d_lyt_file_selectNP/symbols.txt | 24 ++--- .../rels/d_lyt_seeker_stoneNP/symbols.txt | 22 ++--- .../SOUE01/rels/d_lyt_title_BGNP/symbols.txt | 2 +- config/SOUE01/rels/d_s_bootNP/symbols.txt | 10 +- .../rels/d_t_D3_scene_changeNP/symbols.txt | 4 +- config/SOUE01/rels/d_t_actionNP/symbols.txt | 2 +- .../rels/d_t_auto_messageNP/symbols.txt | 2 +- config/SOUE01/rels/d_t_barrelNP/symbols.txt | 6 +- config/SOUE01/rels/d_t_beetleNP/symbols.txt | 8 +- .../rels/d_t_belt_obstacleNP/symbols.txt | 2 +- .../rels/d_t_clef_managerNP/symbols.txt | 2 +- .../rels/d_t_dungeon_startNP/symbols.txt | 2 +- .../SOUE01/rels/d_t_effect_genNP/symbols.txt | 2 +- .../rels/d_t_gate_to_groundNP/symbols.txt | 2 +- config/SOUE01/rels/d_t_gekotagNP/symbols.txt | 2 +- .../rels/d_t_group_summonNP/symbols.txt | 10 +- config/SOUE01/rels/d_t_harpNP/symbols.txt | 2 +- .../SOUE01/rels/d_t_heat_resistNP/symbols.txt | 2 +- config/SOUE01/rels/d_t_kytagNP/symbols.txt | 2 +- config/SOUE01/rels/d_t_map_markNP/symbols.txt | 2 +- .../rels/d_t_megami_divingNP/symbols.txt | 2 +- config/SOUE01/rels/d_t_miechanNP/symbols.txt | 8 +- config/SOUE01/rels/d_t_musouNP/symbols.txt | 2 +- .../rels/d_t_player_restartNP/symbols.txt | 2 +- config/SOUE01/rels/d_t_plightNP/symbols.txt | 2 +- config/SOUE01/rels/d_t_pltchgNP/symbols.txt | 2 +- .../rels/d_t_pumpkin_clayNP/symbols.txt | 4 +- config/SOUE01/rels/d_t_reactionNP/symbols.txt | 4 +- .../rels/d_t_restart_time_stoneNP/symbols.txt | 2 +- .../rels/d_t_ride_rock_setNP/symbols.txt | 6 +- .../rels/d_t_scene_changeNP/symbols.txt | 2 +- .../SOUE01/rels/d_t_ship_floodNP/symbols.txt | 4 +- .../symbols.txt | 2 +- .../rels/d_t_siren_time_attackNP/symbols.txt | 4 +- config/SOUE01/rels/d_t_skyEnemyNP/symbols.txt | 4 +- config/SOUE01/rels/d_t_sporeNP/symbols.txt | 4 +- config/SOUE01/rels/d_t_streamNP/symbols.txt | 2 +- .../rels/d_t_sword_battle_gameNP/symbols.txt | 4 +- config/SOUE01/rels/d_t_touchNP/symbols.txt | 2 +- .../SOUE01/rels/d_t_tumble_weedNP/symbols.txt | 4 +- .../SOUE01/rels/d_title_managerNP/symbols.txt | 8 +- tools/ghidra_scripts/GhidraToDtkSymbols.py | 98 ++++++++++++------- 308 files changed, 1196 insertions(+), 1164 deletions(-) diff --git a/config/SOUE01/rels/d_SoftwareKeyboardNP/symbols.txt b/config/SOUE01/rels/d_SoftwareKeyboardNP/symbols.txt index a1749e66..d887fe43 100644 --- a/config/SOUE01/rels/d_SoftwareKeyboardNP/symbols.txt +++ b/config/SOUE01/rels/d_SoftwareKeyboardNP/symbols.txt @@ -1489,7 +1489,7 @@ lbl_2_data_460 = .data:0x00000460; // type:object size:0x44 lbl_2_data_4A4 = .data:0x000004A4; // type:object size:0xC lbl_2_data_4B0 = .data:0x000004B0; // type:object size:0x10 lbl_2_data_4C0 = .data:0x000004C0; // type:object size:0x10 -lbl_2_data_4D0 = .data:0x000004D0; // type:object size:0x60 +SoftwareKeyboard__vtable = .data:0x000004D0; // type:object size:0x60 lbl_2_data_530 = .data:0x00000530; // type:object size:0xC lbl_2_data_53C = .data:0x0000053C; // type:object size:0xC lbl_2_data_548 = .data:0x00000548; // type:object size:0x14 @@ -2228,7 +2228,7 @@ lbl_2_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte lbl_2_bss_9 = .bss:0x00000009; // type:object size:0x1 data:byte lbl_2_bss_C = .bss:0x0000000C; // type:object size:0x4 data:4byte lbl_2_bss_10 = .bss:0x00000010; // type:object size:0x4 data:4byte -lbl_2_bss_14 = .bss:0x00000014; // type:object size:0x4 data:4byte +SOFTWARE_KEYBOARD = .bss:0x00000014; // type:object size:0x4 data:4byte lbl_2_bss_18 = .bss:0x00000018; // type:object size:0x8 data:4byte lbl_2_bss_20 = .bss:0x00000020; // type:object size:0xC lbl_2_bss_2C = .bss:0x0000002C; // type:object size:0x1 data:byte diff --git a/config/SOUE01/rels/d_a_avater_race_mngNP/symbols.txt b/config/SOUE01/rels/d_a_avater_race_mngNP/symbols.txt index acee398b..502b6d08 100644 --- a/config/SOUE01/rels/d_a_avater_race_mngNP/symbols.txt +++ b/config/SOUE01/rels/d_a_avater_race_mngNP/symbols.txt @@ -72,7 +72,7 @@ lbl_136_section4_108 = .data:0x00000108; // type:object size:0x18 lbl_136_section4_120 = .data:0x00000120; // type:object size:0x244 lbl_136_section4_364 = .data:0x00000364; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_136_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte +AVATER_RACE_MNG = .bss:0x00000008; // type:object size:0x10 data:4byte lbl_136_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte lbl_136_bss_58 = .bss:0x00000058; // type:object size:0xC0 data:4byte lbl_136_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte diff --git a/config/SOUE01/rels/d_a_b_asuraNP/symbols.txt b/config/SOUE01/rels/d_a_b_asuraNP/symbols.txt index 0fe001b4..3ddc7175 100644 --- a/config/SOUE01/rels/d_a_b_asuraNP/symbols.txt +++ b/config/SOUE01/rels/d_a_b_asuraNP/symbols.txt @@ -241,7 +241,7 @@ lbl_245_rodata_3FC = .rodata:0x000003FC; // type:object size:0xF0 data:float g_profile_B_ASURA = .data:0x00000000; // type:object size:0x10 data:4byte lbl_245_data_10 = .data:0x00000010; // type:object size:0x10 lbl_245_data_20 = .data:0x00000020; // type:object size:0xC -lbl_245_data_2C = .data:0x0000002C; // type:object size:0x10 +s_AsuraLHigArm_80c198f4 = .data:0x0000002C; // type:object size:0x10 lbl_245_data_3C = .data:0x0000003C; // type:object size:0x10 lbl_245_data_4C = .data:0x0000004C; // type:object size:0x10 lbl_245_data_5C = .data:0x0000005C; // type:object size:0x10 @@ -251,7 +251,7 @@ lbl_245_data_90 = .data:0x00000090; // type:object size:0x18 data:4byte lbl_245_data_A8 = .data:0x000000A8; // type:object size:0xC lbl_245_data_B4 = .data:0x000000B4; // type:object size:0xC lbl_245_data_C0 = .data:0x000000C0; // type:object size:0x8 -lbl_245_data_C8 = .data:0x000000C8; // type:object size:0x8 +s_test_80c19990 = .data:0x000000C8; // type:object size:0x8 lbl_245_data_D0 = .data:0x000000D0; // type:object size:0x10 lbl_245_data_E0 = .data:0x000000E0; // type:object size:0x10 lbl_245_data_F0 = .data:0x000000F0; // type:object size:0x10 @@ -337,7 +337,7 @@ lbl_245_data_BD0 = .data:0x00000BD0; // type:object size:0x4 data:4byte lbl_245_data_BD4 = .data:0x00000BD4; // type:object size:0x3C data:4byte jumptable_245_data_C10 = .data:0x00000C10; // type:object size:0x28 scope:local jumptable_245_data_C68 = .data:0x00000C68; // type:object size:0x30 scope:local -lbl_245_data_CC8 = .data:0x00000CC8; // type:object size:0x90 +AcBAsura__vtable = .data:0x00000CC8; // type:object size:0x90 lbl_245_data_D58 = .data:0x00000D58; // type:object size:0x30 lbl_245_data_D88 = .data:0x00000D88; // type:object size:0x30 lbl_245_data_DB8 = .data:0x00000DB8; // type:object size:0x18 @@ -350,18 +350,18 @@ lbl_245_data_F50 = .data:0x00000F50; // type:object size:0x68C lbl_245_data_15DC = .data:0x000015DC; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_245_bss_8 = .bss:0x00000008; // type:object size:0x10 data:float -lbl_245_bss_18 = .bss:0x00000018; // type:object size:0x100 data:4byte -lbl_245_bss_118 = .bss:0x00000118; // type:object size:0x80 data:4byte -lbl_245_bss_198 = .bss:0x00000198; // type:object size:0x180 data:4byte -lbl_245_bss_318 = .bss:0x00000318; // type:object size:0x80 data:4byte -lbl_245_bss_398 = .bss:0x00000398; // type:object size:0x40 data:4byte -lbl_245_bss_3D8 = .bss:0x000003D8; // type:object size:0x40 data:4byte -lbl_245_bss_418 = .bss:0x00000418; // type:object size:0x40 data:4byte -lbl_245_bss_458 = .bss:0x00000458; // type:object size:0x80 data:4byte -lbl_245_bss_4D8 = .bss:0x000004D8; // type:object size:0x40 data:4byte -lbl_245_bss_518 = .bss:0x00000518; // type:object size:0x40 data:4byte -lbl_245_bss_558 = .bss:0x00000558; // type:object size:0x40 data:4byte -lbl_245_bss_598 = .bss:0x00000598; // type:object size:0xB0 data:4byte +AcBAsura__StateID_Attack = .bss:0x00000018; // type:object size:0x100 data:4byte +AcBAsura__StateID_BreakWaitB = .bss:0x00000118; // type:object size:0x80 data:4byte +AcBAsura__StateID_CutAllB = .bss:0x00000198; // type:object size:0x180 data:4byte +AcBAsura__StateID_DisconnectB = .bss:0x00000318; // type:object size:0x80 data:4byte +AcBAsura__StateID_Recover = .bss:0x00000398; // type:object size:0x40 data:4byte +AcBAsura__StateID_RecoverB = .bss:0x000003D8; // type:object size:0x40 data:4byte +AcBAsura__StateID_StunB = .bss:0x00000418; // type:object size:0x40 data:4byte +AcBAsura__StateID_SummonB = .bss:0x00000458; // type:object size:0x80 data:4byte +AcBAsura__StateID_Wait = .bss:0x000004D8; // type:object size:0x40 data:4byte +AcBAsura__StateID_WaitB = .bss:0x00000518; // type:object size:0x40 data:4byte +AcBAsura__StateID_Start = .bss:0x00000558; // type:object size:0x40 data:4byte +AcBAsura__StateID_StartB = .bss:0x00000598; // type:object size:0xB0 data:4byte lbl_245_bss_648 = .bss:0x00000648; // type:object size:0xC data:2byte lbl_245_bss_654 = .bss:0x00000654; // type:object size:0xC lbl_245_bss_660 = .bss:0x00000660; // type:object size:0xC diff --git a/config/SOUE01/rels/d_a_b_girahimu3_secondNP/symbols.txt b/config/SOUE01/rels/d_a_b_girahimu3_secondNP/symbols.txt index c4c00b66..6fed9a3a 100644 --- a/config/SOUE01/rels/d_a_b_girahimu3_secondNP/symbols.txt +++ b/config/SOUE01/rels/d_a_b_girahimu3_secondNP/symbols.txt @@ -177,7 +177,7 @@ g_profile_B_GIRAHIMU3_SECOND = .data:0x00000000; // type:object size:0x10 data:4 lbl_231_data_10 = .data:0x00000010; // type:object size:0x2C lbl_231_data_3C = .data:0x0000003C; // type:object size:0x4 data:4byte lbl_231_data_40 = .data:0x00000040; // type:object size:0x4 data:4byte -lbl_231_data_44 = .data:0x00000044; // type:object size:0x10 +s_GuardSwordSide_80bcbba8 = .data:0x00000044; // type:object size:0x10 lbl_231_data_54 = .data:0x00000054; // type:object size:0x14 jumptable_231_data_68 = .data:0x00000068; // type:object size:0x138 scope:local lbl_231_data_1A0 = .data:0x000001A0; // type:object size:0xC data:4byte diff --git a/config/SOUE01/rels/d_a_b_girahimuNP/symbols.txt b/config/SOUE01/rels/d_a_b_girahimuNP/symbols.txt index d2e75342..b28d491d 100644 --- a/config/SOUE01/rels/d_a_b_girahimuNP/symbols.txt +++ b/config/SOUE01/rels/d_a_b_girahimuNP/symbols.txt @@ -129,7 +129,7 @@ lbl_227_data_17C = .data:0x0000017C; // type:object size:0x8 lbl_227_data_184 = .data:0x00000184; // type:object size:0xC data:4byte lbl_227_data_190 = .data:0x00000190; // type:object size:0xC data:4byte jumptable_227_data_19C = .data:0x0000019C; // type:object size:0x24 scope:local -lbl_227_data_1C0 = .data:0x000001C0; // type:object size:0x238 +AcGirahimu__vtable = .data:0x000001C0; // type:object size:0x238 lbl_227_data_3F8 = .data:0x000003F8; // type:object size:0x70 lbl_227_data_468 = .data:0x00000468; // type:object size:0x30 lbl_227_data_498 = .data:0x00000498; // type:object size:0x30 @@ -146,10 +146,10 @@ lbl_227_data_914 = .data:0x00000914; // type:object size:0x8 lbl_227_data_91C = .data:0x0000091C; // type:object size:0x8 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_227_bss_8 = .bss:0x00000008; // type:object size:0x50 data:4byte -lbl_227_bss_58 = .bss:0x00000058; // type:object size:0x3C data:4byte -lbl_227_bss_94 = .bss:0x00000094; // type:object size:0x44 data:4byte -lbl_227_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_227_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_227_bss_158 = .bss:0x00000158; // type:object size:0x40 data:4byte -lbl_227_bss_198 = .bss:0x00000198; // type:object size:0x40 data:4byte -lbl_227_bss_1D8 = .bss:0x000001D8; // type:object size:0x70 data:4byte +AcGirahimu__STATE_SWORD_WAIT = .bss:0x00000058; // type:object size:0x3C data:4byte +AcGirahimu__STATE_SWORD_DAMAGE = .bss:0x00000094; // type:object size:0x44 data:4byte +AcGirahimu__STATE_SWORD_PIYORI = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcGirahimu__STATE_KNIFE = .bss:0x00000118; // type:object size:0x40 data:4byte +AcGirahimu__STATE_KNIFE_ATTACK = .bss:0x00000158; // type:object size:0x40 data:4byte +AcGirahimu__STATE_DEATH = .bss:0x00000198; // type:object size:0x40 data:4byte +AcGirahimu__STATE_DEATH_MINI_GAME = .bss:0x000001D8; // type:object size:0x70 data:4byte diff --git a/config/SOUE01/rels/d_a_b_girahimu_baseNP/symbols.txt b/config/SOUE01/rels/d_a_b_girahimu_baseNP/symbols.txt index 67ec9859..f3beec37 100644 --- a/config/SOUE01/rels/d_a_b_girahimu_baseNP/symbols.txt +++ b/config/SOUE01/rels/d_a_b_girahimu_baseNP/symbols.txt @@ -342,7 +342,7 @@ lbl_226_data_410 = .data:0x00000410; // type:object size:0xC lbl_226_data_41C = .data:0x0000041C; // type:object size:0xC lbl_226_data_428 = .data:0x00000428; // type:object size:0x3C data:4byte jumptable_226_data_464 = .data:0x00000464; // type:object size:0x40 scope:local -lbl_226_data_4DC = .data:0x000004DC; // type:object size:0x234 +AcGirahimuBase__vtable = .data:0x000004DC; // type:object size:0x234 lbl_226_data_710 = .data:0x00000710; // type:object size:0x70 lbl_226_data_780 = .data:0x00000780; // type:object size:0x30 lbl_226_data_7B0 = .data:0x000007B0; // type:object size:0x30 @@ -359,28 +359,28 @@ lbl_226_data_11E8 = .data:0x000011E8; // type:object size:0x8 lbl_226_data_11F0 = .data:0x000011F0; // type:object size:0x8 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_226_bss_8 = .bss:0x00000008; // type:object size:0xC data:4byte -lbl_226_bss_14 = .bss:0x00000014; // type:object size:0x40 data:4byte -lbl_226_bss_54 = .bss:0x00000054; // type:object size:0x40 -lbl_226_bss_94 = .bss:0x00000094; // type:object size:0x40 data:4byte -lbl_226_bss_D4 = .bss:0x000000D4; // type:object size:0x40 -lbl_226_bss_114 = .bss:0x00000114; // type:object size:0x40 -lbl_226_bss_154 = .bss:0x00000154; // type:object size:0x40 data:4byte -lbl_226_bss_194 = .bss:0x00000194; // type:object size:0x80 data:4byte -lbl_226_bss_214 = .bss:0x00000214; // type:object size:0x40 data:4byte -lbl_226_bss_254 = .bss:0x00000254; // type:object size:0x40 data:4byte -lbl_226_bss_294 = .bss:0x00000294; // type:object size:0x40 data:4byte -lbl_226_bss_2D4 = .bss:0x000002D4; // type:object size:0x40 data:4byte -lbl_226_bss_314 = .bss:0x00000314; // type:object size:0x80 -lbl_226_bss_394 = .bss:0x00000394; // type:object size:0x40 data:4byte -lbl_226_bss_3D4 = .bss:0x000003D4; // type:object size:0x40 data:4byte -lbl_226_bss_414 = .bss:0x00000414; // type:object size:0x80 data:4byte -lbl_226_bss_494 = .bss:0x00000494; // type:object size:0x40 -lbl_226_bss_4D4 = .bss:0x000004D4; // type:object size:0x40 data:4byte -lbl_226_bss_514 = .bss:0x00000514; // type:object size:0x40 -lbl_226_bss_554 = .bss:0x00000554; // type:object size:0x40 data:4byte -lbl_226_bss_594 = .bss:0x00000594; // type:object size:0x40 data:4byte -lbl_226_bss_5D4 = .bss:0x000005D4; // type:object size:0x40 -lbl_226_bss_614 = .bss:0x00000614; // type:object size:0x40 data:4byte -lbl_226_bss_654 = .bss:0x00000654; // type:object size:0x40 -lbl_226_bss_694 = .bss:0x00000694; // type:object size:0x40 data:4byte -lbl_226_bss_6D4 = .bss:0x000006D4; // type:object size:0x64 +AcGirahimuBase__STATE_WAIT = .bss:0x00000014; // type:object size:0x40 data:4byte +AcGirahimuBase__STATE_WALK = .bss:0x00000054; // type:object size:0x40 +AcGirahimuBase__STATE_PANCH = .bss:0x00000094; // type:object size:0x40 data:4byte +AcGirahimuBase__STATE_CATCH = .bss:0x000000D4; // type:object size:0x40 +AcGirahimuBase__STATE_CATCH_DAMAGE = .bss:0x00000114; // type:object size:0x40 +AcGirahimuBase__STATE_GET_SWORD = .bss:0x00000154; // type:object size:0x40 data:4byte +AcGirahimuBase__STATE_LINK_SWORD_WAIT = .bss:0x00000194; // type:object size:0x80 data:4byte +AcGirahimuBase__STATE_LINK_SWORD_ATTACK = .bss:0x00000214; // type:object size:0x40 data:4byte +AcGirahimuBase__STATE_RETURN_SWORD = .bss:0x00000254; // type:object size:0x40 data:4byte +AcGirahimuBase__STATE_LINK_SWORD_GUARD_JUST = .bss:0x00000294; // type:object size:0x40 data:4byte +AcGirahimuBase__STATE_SEARCH_SWORD = .bss:0x000002D4; // type:object size:0x40 data:4byte +AcGirahimuBase__STATE_HOME_WARP = .bss:0x00000314; // type:object size:0x80 +AcGirahimuBase__STATE_RELEASE_SWORD = .bss:0x00000394; // type:object size:0x40 data:4byte +AcGirahimuBase__STATE_BACK_STEP = .bss:0x000003D4; // type:object size:0x40 data:4byte +AcGirahimuBase__STATE_ESCAPE = .bss:0x00000414; // type:object size:0x80 data:4byte +AcGirahimuBase__STATE_FRONT_WARP = .bss:0x00000494; // type:object size:0x40 +AcGirahimuBase__STATE_FRONT_ATTACK = .bss:0x000004D4; // type:object size:0x40 data:4byte +AcGirahimuBase__STATE_BACK_WARP = .bss:0x00000514; // type:object size:0x40 +AcGirahimuBase__STATE_BACK_ATTACK = .bss:0x00000554; // type:object size:0x40 data:4byte +AcGirahimuBase__STATE_COUNTER = .bss:0x00000594; // type:object size:0x40 data:4byte +AcGirahimuBase__STATE_RUN = .bss:0x000005D4; // type:object size:0x40 +AcGirahimuBase__STATE_RUN_ATTACK = .bss:0x00000614; // type:object size:0x40 data:4byte +AcGirahimuBase__STATE_BACK_WALK = .bss:0x00000654; // type:object size:0x40 +AcGirahimuBase__STATE_SWORD_DAMAGE = .bss:0x00000694; // type:object size:0x40 data:4byte +AcGirahimuBase__STATE_KNIFE_DAMAGE = .bss:0x000006D4; // type:object size:0x64 diff --git a/config/SOUE01/rels/d_a_b_krNP/symbols.txt b/config/SOUE01/rels/d_a_b_krNP/symbols.txt index 238c9638..e660fa23 100644 --- a/config/SOUE01/rels/d_a_b_krNP/symbols.txt +++ b/config/SOUE01/rels/d_a_b_krNP/symbols.txt @@ -137,7 +137,7 @@ lbl_140_data_2C0 = .data:0x000002C0; // type:object size:0x10 lbl_140_data_2D0 = .data:0x000002D0; // type:object size:0xC lbl_140_data_2DC = .data:0x000002DC; // type:object size:0x10 lbl_140_data_2EC = .data:0x000002EC; // type:object size:0x130 -lbl_140_data_41C = .data:0x0000041C; // type:object size:0x8C +AcBkr__vtable = .data:0x0000041C; // type:object size:0x8C lbl_140_data_4A8 = .data:0x000004A8; // type:object size:0x70 lbl_140_data_518 = .data:0x00000518; // type:object size:0x30 lbl_140_data_548 = .data:0x00000548; // type:object size:0x30 @@ -147,10 +147,10 @@ lbl_140_data_5A8 = .data:0x000005A8; // type:object size:0x394 lbl_140_data_93C = .data:0x0000093C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_140_bss_8 = .bss:0x00000008; // type:object size:0x50 data:4byte -lbl_140_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_140_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_140_bss_D8 = .bss:0x000000D8; // type:object size:0xC0 data:4byte -lbl_140_bss_198 = .bss:0x00000198; // type:object size:0x80 data:4byte -lbl_140_bss_218 = .bss:0x00000218; // type:object size:0x1F0 +AcBkr__STATE_UNDER_WATER = .bss:0x00000058; // type:object size:0x40 data:4byte +AcBkr__STATE_APPEAR = .bss:0x00000098; // type:object size:0x40 data:4byte +AcBkr__STATE_FIGHT = .bss:0x000000D8; // type:object size:0xC0 data:4byte +AcBkr__STATE_LAST_FIGHT = .bss:0x00000198; // type:object size:0x80 data:4byte +AcBkr__STATE_ARM_DAMAGE = .bss:0x00000218; // type:object size:0x1F0 lbl_140_bss_408 = .bss:0x00000408; // type:object size:0x1 data:byte lbl_140_bss_40C = .bss:0x0000040C; // type:object size:0x3C data:float diff --git a/config/SOUE01/rels/d_a_b_nusiNP/symbols.txt b/config/SOUE01/rels/d_a_b_nusiNP/symbols.txt index 118d65ab..c38ea043 100644 --- a/config/SOUE01/rels/d_a_b_nusiNP/symbols.txt +++ b/config/SOUE01/rels/d_a_b_nusiNP/symbols.txt @@ -148,7 +148,7 @@ lbl_235_data_114 = .data:0x00000114; // type:object size:0x4 data:4byte lbl_235_data_118 = .data:0x00000118; // type:object size:0xC data:string lbl_235_data_124 = .data:0x00000124; // type:object size:0x4 data:4byte lbl_235_data_128 = .data:0x00000128; // type:object size:0x8 -lbl_235_data_130 = .data:0x00000130; // type:object size:0xB0 +AcNusi__vtable = .data:0x00000130; // type:object size:0xB0 lbl_235_data_1E0 = .data:0x000001E0; // type:object size:0x30 lbl_235_data_210 = .data:0x00000210; // type:object size:0x30 lbl_235_data_240 = .data:0x00000240; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_b_vdNP/symbols.txt b/config/SOUE01/rels/d_a_b_vdNP/symbols.txt index b779bf52..9ea59087 100644 --- a/config/SOUE01/rels/d_a_b_vdNP/symbols.txt +++ b/config/SOUE01/rels/d_a_b_vdNP/symbols.txt @@ -218,7 +218,7 @@ lbl_117_data_6A8 = .data:0x000006A8; // type:object size:0x2C data:4byte jumptable_117_data_6D4 = .data:0x000006D4; // type:object size:0x20 scope:local lbl_117_data_6F4 = .data:0x000006F4; // type:object size:0xC data:4byte jumptable_117_data_700 = .data:0x00000700; // type:object size:0x34 scope:local -lbl_117_data_734 = .data:0x00000734; // type:object size:0x8C +AcBvd__vtable = .data:0x00000734; // type:object size:0x8C lbl_117_data_7C0 = .data:0x000007C0; // type:object size:0x70 lbl_117_data_830 = .data:0x00000830; // type:object size:0x70 lbl_117_data_8A0 = .data:0x000008A0; // type:object size:0x30 @@ -231,14 +231,14 @@ lbl_117_data_9B8 = .data:0x000009B8; // type:object size:0x2F0 lbl_117_data_CA8 = .data:0x00000CA8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_117_bss_8 = .bss:0x00000008; // type:object size:0x10 data:2byte -lbl_117_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_117_bss_58 = .bss:0x00000058; // type:object size:0x80 data:4byte -lbl_117_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_117_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_117_bss_158 = .bss:0x00000158; // type:object size:0x40 data:4byte -lbl_117_bss_198 = .bss:0x00000198; // type:object size:0x80 data:4byte -lbl_117_bss_218 = .bss:0x00000218; // type:object size:0x40 data:4byte -lbl_117_bss_258 = .bss:0x00000258; // type:object size:0x70 data:4byte +AcBvd__StateID_Opening = .bss:0x00000018; // type:object size:0x40 data:4byte +AcBvd__StateID_Wait = .bss:0x00000058; // type:object size:0x80 data:4byte +AcBvd__StateID_Run = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcBvd__StateID_FireAttack = .bss:0x00000118; // type:object size:0x40 data:4byte +AcBvd__StateID_Eat = .bss:0x00000158; // type:object size:0x40 data:4byte +AcBvd__StateID_Damage = .bss:0x00000198; // type:object size:0x80 data:4byte +AcBvd__StateID_BodyReverse = .bss:0x00000218; // type:object size:0x40 data:4byte +AcBvd__StateID_InitMove = .bss:0x00000258; // type:object size:0x70 data:4byte lbl_117_bss_2C8 = .bss:0x000002C8; // type:object size:0x24 data:2byte lbl_117_bss_2EC = .bss:0x000002EC; // type:object size:0x4 data:4byte lbl_117_bss_2F0 = .bss:0x000002F0; // type:object size:0x1 data:byte diff --git a/config/SOUE01/rels/d_a_birdNP/symbols.txt b/config/SOUE01/rels/d_a_birdNP/symbols.txt index 49519674..6f16e74c 100644 --- a/config/SOUE01/rels/d_a_birdNP/symbols.txt +++ b/config/SOUE01/rels/d_a_birdNP/symbols.txt @@ -223,7 +223,7 @@ lbl_129_data_3F8 = .data:0x000003F8; // type:object size:0x14 lbl_129_data_40C = .data:0x0000040C; // type:object size:0x4 data:4byte lbl_129_data_410 = .data:0x00000410; // type:object size:0xC data:4byte lbl_129_data_41C = .data:0x0000041C; // type:object size:0xC data:string -lbl_129_data_428 = .data:0x00000428; // type:object size:0x80 +AcBird__vtable = .data:0x00000428; // type:object size:0x80 lbl_129_data_4A8 = .data:0x000004A8; // type:object size:0x30 lbl_129_data_4D8 = .data:0x000004D8; // type:object size:0x30 lbl_129_data_508 = .data:0x00000508; // type:object size:0x18 @@ -252,13 +252,13 @@ lbl_129_data_B50 = .data:0x00000B50; // type:object size:0xC data:string lbl_129_data_B5C = .data:0x00000B5C; // type:object size:0xC __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_129_bss_8 = .bss:0x00000008; // type:object size:0x14 data:4byte -lbl_129_bss_1C = .bss:0x0000001C; // type:object size:0x94 data:4byte -lbl_129_bss_B0 = .bss:0x000000B0; // type:object size:0x40 data:4byte -lbl_129_bss_F0 = .bss:0x000000F0; // type:object size:0x40 data:4byte -lbl_129_bss_130 = .bss:0x00000130; // type:object size:0xC0 data:4byte -lbl_129_bss_1F0 = .bss:0x000001F0; // type:object size:0x40 data:4byte -lbl_129_bss_230 = .bss:0x00000230; // type:object size:0x40 data:4byte -lbl_129_bss_270 = .bss:0x00000270; // type:object size:0x80 data:4byte -lbl_129_bss_2F0 = .bss:0x000002F0; // type:object size:0x40 data:4byte -lbl_129_bss_330 = .bss:0x00000330; // type:object size:0x80 data:4byte -lbl_129_bss_3B0 = .bss:0x000003B0; // type:object size:0x48 data:4byte +LOFTWING_POINTER = .bss:0x0000001C; // type:object size:0x94 data:4byte +AcBird__STATE_MOVE = .bss:0x000000B0; // type:object size:0x40 data:4byte +AcBird__STATE_HIDE = .bss:0x000000F0; // type:object size:0x40 data:4byte +AcBird__STATE_RIDE_DEMO = .bss:0x00000130; // type:object size:0xC0 data:4byte +AcBird__STATE_RIDE_OFF = .bss:0x000001F0; // type:object size:0x40 data:4byte +AcBird__STATE_ON_GROUND = .bss:0x00000230; // type:object size:0x40 data:4byte +AcBird__STATE_TORNADO = .bss:0x00000270; // type:object size:0x80 data:4byte +AcBird__STATE_MINIGAME_WAIT = .bss:0x000002F0; // type:object size:0x40 data:4byte +AcBird__STATE_MINIGAME_MOVE = .bss:0x00000330; // type:object size:0x80 data:4byte +AcBird__STATE_MINIGAME_LEVELUP = .bss:0x000003B0; // type:object size:0x48 data:4byte diff --git a/config/SOUE01/rels/d_a_bombfNP/symbols.txt b/config/SOUE01/rels/d_a_bombfNP/symbols.txt index b6b93eec..efe9ce10 100644 --- a/config/SOUE01/rels/d_a_bombfNP/symbols.txt +++ b/config/SOUE01/rels/d_a_bombfNP/symbols.txt @@ -58,4 +58,4 @@ lbl_17_data_190 = .data:0x00000190; // type:object size:0x34 lbl_17_data_1C4 = .data:0x000001C4; // type:object size:0x8 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_17_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_17_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcBombf__StateID_Wait = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_co_testNP/symbols.txt b/config/SOUE01/rels/d_a_co_testNP/symbols.txt index 75dc8472..07f73841 100644 --- a/config/SOUE01/rels/d_a_co_testNP/symbols.txt +++ b/config/SOUE01/rels/d_a_co_testNP/symbols.txt @@ -41,8 +41,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global lbl_331_rodata_0 = .rodata:0x00000000; // type:object size:0x10 data:float g_profile_CO_TEST = .data:0x00000000; // type:object size:0x10 data:4byte -lbl_331_data_10 = .data:0x00000010; // type:object size:0x30 data:float -lbl_331_data_40 = .data:0x00000040; // type:object size:0x80 +AcCoTest__colliderInit = .data:0x00000010; // type:object size:0x30 data:float +AcCoTest__vtable = .data:0x00000040; // type:object size:0x80 lbl_331_data_C0 = .data:0x000000C0; // type:object size:0x30 lbl_331_data_F0 = .data:0x000000F0; // type:object size:0x30 lbl_331_data_120 = .data:0x00000120; // type:object size:0x18 @@ -50,4 +50,4 @@ lbl_331_data_138 = .data:0x00000138; // type:object size:0x58 lbl_331_data_190 = .data:0x00000190; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_331_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_331_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcCoTest__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_controlNP/symbols.txt b/config/SOUE01/rels/d_a_controlNP/symbols.txt index abf7b798..5d5102a8 100644 --- a/config/SOUE01/rels/d_a_controlNP/symbols.txt +++ b/config/SOUE01/rels/d_a_controlNP/symbols.txt @@ -67,7 +67,7 @@ lbl_152_rodata_28 = .rodata:0x00000028; // type:object size:0x4 data:float lbl_152_rodata_2C = .rodata:0x0000002C; // type:object size:0x18 data:float g_profile_ENEMY_CONTROL = .data:0x00000000; // type:object size:0x10 data:4byte lbl_152_data_10 = .data:0x00000010; // type:object size:0x8 data:4byte -lbl_152_data_18 = .data:0x00000018; // type:object size:0x80 +AcEnCl__vtable = .data:0x00000018; // type:object size:0x80 lbl_152_data_98 = .data:0x00000098; // type:object size:0x30 lbl_152_data_C8 = .data:0x000000C8; // type:object size:0x30 lbl_152_data_F8 = .data:0x000000F8; // type:object size:0x18 @@ -75,5 +75,5 @@ lbl_152_data_110 = .data:0x00000110; // type:object size:0x1E8 lbl_152_data_2F8 = .data:0x000002F8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_152_bss_8 = .bss:0x00000008; // type:object size:0x150 data:float -lbl_152_bss_158 = .bss:0x00000158; // type:object size:0x40 data:4byte -lbl_152_bss_198 = .bss:0x00000198; // type:object size:0x1E8 data:4byte +AcEnCl__STATE_RANGE_MOVE = .bss:0x00000158; // type:object size:0x40 data:4byte +AcEnCl__STATE_RANGE_SEARCH = .bss:0x00000198; // type:object size:0x1E8 data:4byte diff --git a/config/SOUE01/rels/d_a_e_battleshipfishNP/symbols.txt b/config/SOUE01/rels/d_a_e_battleshipfishNP/symbols.txt index bd9688d4..0c8f9a4d 100644 --- a/config/SOUE01/rels/d_a_e_battleshipfishNP/symbols.txt +++ b/config/SOUE01/rels/d_a_e_battleshipfishNP/symbols.txt @@ -116,7 +116,7 @@ lbl_185_data_134 = .data:0x00000134; // type:object size:0xC data:string lbl_185_data_140 = .data:0x00000140; // type:object size:0x4 data:4byte lbl_185_data_144 = .data:0x00000144; // type:object size:0x4 data:4byte lbl_185_data_148 = .data:0x00000148; // type:object size:0x24 data:4byte -lbl_185_data_16C = .data:0x0000016C; // type:object size:0x8C +AcEbfish__vtable = .data:0x0000016C; // type:object size:0x8C lbl_185_data_1F8 = .data:0x000001F8; // type:object size:0x30 lbl_185_data_228 = .data:0x00000228; // type:object size:0x30 lbl_185_data_258 = .data:0x00000258; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_e_bcNP/symbols.txt b/config/SOUE01/rels/d_a_e_bcNP/symbols.txt index a6036cff..71ca08a0 100644 --- a/config/SOUE01/rels/d_a_e_bcNP/symbols.txt +++ b/config/SOUE01/rels/d_a_e_bcNP/symbols.txt @@ -289,7 +289,7 @@ lbl_165_data_6A0 = .data:0x000006A0; // type:object size:0x8 data:string lbl_165_data_6A8 = .data:0x000006A8; // type:object size:0x40 lbl_165_data_6E8 = .data:0x000006E8; // type:object size:0x58 lbl_165_data_740 = .data:0x00000740; // type:object size:0x4 data:4byte -lbl_165_data_744 = .data:0x00000744; // type:object size:0x8C +AcEBc__vtable = .data:0x00000744; // type:object size:0x8C lbl_165_data_7D0 = .data:0x000007D0; // type:object size:0x30 lbl_165_data_800 = .data:0x00000800; // type:object size:0x30 lbl_165_data_830 = .data:0x00000830; // type:object size:0x18 @@ -307,19 +307,19 @@ lbl_165_data_A10 = .data:0x00000A10; // type:object size:0x928 lbl_165_data_1338 = .data:0x00001338; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_165_bss_8 = .bss:0x00000008; // type:object size:0x10 data:2byte -lbl_165_bss_18 = .bss:0x00000018; // type:object size:0xC0 data:4byte -lbl_165_bss_D8 = .bss:0x000000D8; // type:object size:0xC0 data:4byte -lbl_165_bss_198 = .bss:0x00000198; // type:object size:0x80 data:4byte -lbl_165_bss_218 = .bss:0x00000218; // type:object size:0x40 data:4byte -lbl_165_bss_258 = .bss:0x00000258; // type:object size:0x40 data:4byte -lbl_165_bss_298 = .bss:0x00000298; // type:object size:0xC0 data:4byte -lbl_165_bss_358 = .bss:0x00000358; // type:object size:0x180 data:4byte -lbl_165_bss_4D8 = .bss:0x000004D8; // type:object size:0x40 data:4byte -lbl_165_bss_518 = .bss:0x00000518; // type:object size:0x280 data:4byte -lbl_165_bss_798 = .bss:0x00000798; // type:object size:0x40 data:4byte +AcEBc__STATE_STANDBY = .bss:0x00000018; // type:object size:0xC0 data:4byte +AcEBc__STATE_LANTERN = .bss:0x000000D8; // type:object size:0xC0 data:4byte +AcEBc__STATE_LANTERN_PATH = .bss:0x00000198; // type:object size:0x80 data:4byte +AcEBc__STATE_FIGHT_START = .bss:0x00000218; // type:object size:0x40 data:4byte +AcEBc__STATE_FIND_CALL = .bss:0x00000258; // type:object size:0x40 data:4byte +AcEBc__STATE_FIGHT = .bss:0x00000298; // type:object size:0xC0 data:4byte +AcEBc__STATE_STEP_ATTACK = .bss:0x00000358; // type:object size:0x180 data:4byte +AcEBc__STATE_FAIL = .bss:0x000004D8; // type:object size:0x40 data:4byte +AcEBc__STATE_FALL = .bss:0x00000518; // type:object size:0x280 data:4byte +AcEBc__STATE_ASTANDBY = .bss:0x00000798; // type:object size:0x40 data:4byte lbl_165_bss_7D8 = .bss:0x000007D8; // type:object size:0x40 data:4byte -lbl_165_bss_818 = .bss:0x00000818; // type:object size:0x40 data:4byte -lbl_165_bss_858 = .bss:0x00000858; // type:object size:0x70 data:4byte +AcEBc__STATE_APATH = .bss:0x00000818; // type:object size:0x40 data:4byte +AcEBc__STATE_AATTACK = .bss:0x00000858; // type:object size:0x70 data:4byte lbl_165_bss_8C8 = .bss:0x000008C8; // type:object size:0xD0 data:2byte lbl_165_bss_998 = .bss:0x00000998; // type:object size:0x1 data:byte lbl_165_bss_99C = .bss:0x0000099C; // type:object size:0xB0 data:float diff --git a/config/SOUE01/rels/d_a_e_beamosNP/symbols.txt b/config/SOUE01/rels/d_a_e_beamosNP/symbols.txt index ae8355aa..60f24f24 100644 --- a/config/SOUE01/rels/d_a_e_beamosNP/symbols.txt +++ b/config/SOUE01/rels/d_a_e_beamosNP/symbols.txt @@ -175,7 +175,7 @@ lbl_151_data_154 = .data:0x00000154; // type:object size:0x10 lbl_151_data_164 = .data:0x00000164; // type:object size:0x10 lbl_151_data_174 = .data:0x00000174; // type:object size:0xC lbl_151_data_180 = .data:0x00000180; // type:object size:0x60 -lbl_151_data_1E0 = .data:0x000001E0; // type:object size:0xC +s_BodyAttack_80a3e398 = .data:0x000001E0; // type:object size:0xC lbl_151_data_1EC = .data:0x000001EC; // type:object size:0x10 lbl_151_data_1FC = .data:0x000001FC; // type:object size:0x10 lbl_151_data_20C = .data:0x0000020C; // type:object size:0xC diff --git a/config/SOUE01/rels/d_a_e_bsNP/symbols.txt b/config/SOUE01/rels/d_a_e_bsNP/symbols.txt index 02c62c97..6e599c78 100644 --- a/config/SOUE01/rels/d_a_e_bsNP/symbols.txt +++ b/config/SOUE01/rels/d_a_e_bsNP/symbols.txt @@ -105,11 +105,11 @@ lbl_146_data_320 = .data:0x00000320; // type:object size:0x208 lbl_146_data_528 = .data:0x00000528; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_146_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_146_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_146_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_146_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_146_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_146_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_146_bss_158 = .bss:0x00000158; // type:object size:0x40 data:4byte -lbl_146_bss_198 = .bss:0x00000198; // type:object size:0x40 data:4byte -lbl_146_bss_1D8 = .bss:0x000001D8; // type:object size:0x70 data:4byte +AcEbs__STATE_STANDBY = .bss:0x00000018; // type:object size:0x40 data:4byte +AcEbs__STATE_STANDBY_B = .bss:0x00000058; // type:object size:0x40 data:4byte +AcEbs__STATE_FIGHT = .bss:0x00000098; // type:object size:0x40 data:4byte +AcEbs__STATE_FIGHT_B = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcEbs__STATE_ATTACK = .bss:0x00000118; // type:object size:0x40 data:4byte +AcEbs__STATE_DAMAGE = .bss:0x00000158; // type:object size:0x40 data:4byte +AcEbs__STATE_FIRE = .bss:0x00000198; // type:object size:0x40 data:4byte +AcEbs__STATE_DISAPPEAR = .bss:0x000001D8; // type:object size:0x70 data:4byte diff --git a/config/SOUE01/rels/d_a_e_captainNP/symbols.txt b/config/SOUE01/rels/d_a_e_captainNP/symbols.txt index a5d82482..0701970d 100644 --- a/config/SOUE01/rels/d_a_e_captainNP/symbols.txt +++ b/config/SOUE01/rels/d_a_e_captainNP/symbols.txt @@ -142,7 +142,7 @@ lbl_119_rodata_28C = .rodata:0x0000028C; // type:object size:0xFC data:float lbl_119_rodata_388 = .rodata:0x00000388; // type:object size:0x64 lbl_119_data_0 = .data:0x00000000; // type:object size:0x10 data:4byte g_profile_E_CAPTAIN = .data:0x00000010; // type:object size:0x10 -lbl_119_data_20 = .data:0x00000020; // type:object size:0x8 data:string +s_AttackL_808d4e28 = .data:0x00000020; // type:object size:0x8 data:string lbl_119_data_28 = .data:0x00000028; // type:object size:0x10 lbl_119_data_38 = .data:0x00000038; // type:object size:0x8 data:string lbl_119_data_40 = .data:0x00000040; // type:object size:0x10 diff --git a/config/SOUE01/rels/d_a_e_gueNP/symbols.txt b/config/SOUE01/rels/d_a_e_gueNP/symbols.txt index 6824ea76..f7ae833e 100644 --- a/config/SOUE01/rels/d_a_e_gueNP/symbols.txt +++ b/config/SOUE01/rels/d_a_e_gueNP/symbols.txt @@ -121,7 +121,7 @@ lbl_212_data_104 = .data:0x00000104; // type:object size:0x20 lbl_212_data_124 = .data:0x00000124; // type:object size:0x4 data:4byte lbl_212_data_128 = .data:0x00000128; // type:object size:0x4 data:4byte lbl_212_data_12C = .data:0x0000012C; // type:object size:0x4 data:4byte -lbl_212_data_130 = .data:0x00000130; // type:object size:0x90 +AcEgue__vtable = .data:0x00000130; // type:object size:0x90 lbl_212_data_1C0 = .data:0x000001C0; // type:object size:0x30 lbl_212_data_1F0 = .data:0x000001F0; // type:object size:0x30 lbl_212_data_220 = .data:0x00000220; // type:object size:0x18 @@ -131,12 +131,12 @@ lbl_212_data_25C = .data:0x0000025C; // type:object size:0x20C lbl_212_data_468 = .data:0x00000468; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_212_bss_8 = .bss:0x00000008; // type:object size:0x10 data:float -lbl_212_bss_18 = .bss:0x00000018; // type:object size:0xC0 data:4byte -lbl_212_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_212_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_212_bss_158 = .bss:0x00000158; // type:object size:0x40 data:4byte -lbl_212_bss_198 = .bss:0x00000198; // type:object size:0x40 data:4byte -lbl_212_bss_1D8 = .bss:0x000001D8; // type:object size:0x30 data:4byte +AcEgue__StateID_Attack = .bss:0x00000018; // type:object size:0xC0 data:4byte +AcEgue__StateID_FlyHome = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcEgue__StateID_FlyPlayer = .bss:0x00000118; // type:object size:0x40 data:4byte +AcEgue__StateID_Return = .bss:0x00000158; // type:object size:0x40 data:4byte +AcEgue__StateID_Stay = .bss:0x00000198; // type:object size:0x40 data:4byte +AcEgue__StateID_Stun = .bss:0x000001D8; // type:object size:0x30 data:4byte lbl_212_bss_208 = .bss:0x00000208; // type:object size:0x10 data:float lbl_212_bss_218 = .bss:0x00000218; // type:object size:0x24 data:float lbl_212_bss_23C = .bss:0x0000023C; // type:object size:0x10 data:byte diff --git a/config/SOUE01/rels/d_a_e_gumarmNP/symbols.txt b/config/SOUE01/rels/d_a_e_gumarmNP/symbols.txt index 1bd82572..f0e16009 100644 --- a/config/SOUE01/rels/d_a_e_gumarmNP/symbols.txt +++ b/config/SOUE01/rels/d_a_e_gumarmNP/symbols.txt @@ -193,7 +193,7 @@ lbl_250_data_130 = .data:0x00000130; // type:object size:0x8 lbl_250_data_138 = .data:0x00000138; // type:object size:0x8 lbl_250_data_140 = .data:0x00000140; // type:object size:0xC data:4byte lbl_250_data_14C = .data:0x0000014C; // type:object size:0xD8 -lbl_250_data_224 = .data:0x00000224; // type:object size:0x8C +AcGumarm__vtable = .data:0x00000224; // type:object size:0x8C lbl_250_data_2B0 = .data:0x000002B0; // type:object size:0x70 lbl_250_data_320 = .data:0x00000320; // type:object size:0x70 lbl_250_data_390 = .data:0x00000390; // type:object size:0x30 @@ -212,20 +212,20 @@ lbl_250_data_A38 = .data:0x00000A38; // type:object size:0x14 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_250_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte lbl_250_bss_18 = .bss:0x00000018; // type:object size:0xDB8 data:byte -lbl_250_bss_DD0 = .bss:0x00000DD0; // type:object size:0x40 data:4byte -lbl_250_bss_E10 = .bss:0x00000E10; // type:object size:0x40 data:4byte -lbl_250_bss_E50 = .bss:0x00000E50; // type:object size:0x40 data:4byte -lbl_250_bss_E90 = .bss:0x00000E90; // type:object size:0x80 data:4byte -lbl_250_bss_F10 = .bss:0x00000F10; // type:object size:0xC0 data:4byte -lbl_250_bss_FD0 = .bss:0x00000FD0; // type:object size:0x80 data:4byte -lbl_250_bss_1050 = .bss:0x00001050; // type:object size:0x40 data:4byte -lbl_250_bss_1090 = .bss:0x00001090; // type:object size:0x40 data:4byte -lbl_250_bss_10D0 = .bss:0x000010D0; // type:object size:0x40 data:4byte -lbl_250_bss_1110 = .bss:0x00001110; // type:object size:0x40 data:4byte -lbl_250_bss_1150 = .bss:0x00001150; // type:object size:0x40 data:4byte -lbl_250_bss_1190 = .bss:0x00001190; // type:object size:0x40 data:4byte -lbl_250_bss_11D0 = .bss:0x000011D0; // type:object size:0x40 data:4byte -lbl_250_bss_1210 = .bss:0x00001210; // type:object size:0x30 data:4byte +AcGumarm__STATE_HIDE = .bss:0x00000DD0; // type:object size:0x40 data:4byte +AcGumarm__STATE_HIDE_WAIT = .bss:0x00000E10; // type:object size:0x40 data:4byte +AcGumarm__STATE_HIDE_WALK = .bss:0x00000E50; // type:object size:0x40 data:4byte +AcGumarm__STATE_HIDE_MOVE = .bss:0x00000E90; // type:object size:0x80 data:4byte +AcGumarm__STATE_WALK = .bss:0x00000F10; // type:object size:0xC0 data:4byte +AcGumarm__STATE_ATTACK_WALK = .bss:0x00000FD0; // type:object size:0x80 data:4byte +AcGumarm__STATE_LOST = .bss:0x00001050; // type:object size:0x40 data:4byte +AcGumarm__STATE_FIND = .bss:0x00001090; // type:object size:0x40 data:4byte +AcGumarm__STATE_FREEZE_START = .bss:0x000010D0; // type:object size:0x40 data:4byte +AcGumarm__STATE_FREEZE = .bss:0x00001110; // type:object size:0x40 data:4byte +AcGumarm__STATE_FREEZE_END = .bss:0x00001150; // type:object size:0x40 data:4byte +AcGumarm__STATE_SINK = .bss:0x00001190; // type:object size:0x40 data:4byte +AcGumarm__STATE_KEEP_SINK = .bss:0x000011D0; // type:object size:0x40 data:4byte +AcGumarm__STATE_DEAD = .bss:0x00001210; // type:object size:0x30 data:4byte lbl_250_bss_1240 = .bss:0x00001240; // type:object size:0x1 data:byte lbl_250_bss_1241 = .bss:0x00001241; // type:object size:0x1 data:byte lbl_250_bss_1242 = .bss:0x00001242; // type:object size:0x1 data:byte diff --git a/config/SOUE01/rels/d_a_e_gunhobNP/symbols.txt b/config/SOUE01/rels/d_a_e_gunhobNP/symbols.txt index a45c0688..5d4dda57 100644 --- a/config/SOUE01/rels/d_a_e_gunhobNP/symbols.txt +++ b/config/SOUE01/rels/d_a_e_gunhobNP/symbols.txt @@ -79,7 +79,7 @@ lbl_184_rodata_D0 = .rodata:0x000000D0; // type:object size:0x24 data:float lbl_184_rodata_F4 = .rodata:0x000000F4; // type:object size:0x4 data:float lbl_184_data_0 = .data:0x00000000; // type:object size:0x10 data:4byte g_profile_E_GUNHOB = .data:0x00000010; // type:object size:0x10 -lbl_184_data_20 = .data:0x00000020; // type:object size:0xC +s_BombTate_80b04c74 = .data:0x00000020; // type:object size:0xC lbl_184_data_2C = .data:0x0000002C; // type:object size:0x10 lbl_184_data_3C = .data:0x0000003C; // type:object size:0xC lbl_184_data_48 = .data:0x00000048; // type:object size:0x10 diff --git a/config/SOUE01/rels/d_a_e_hydraNP/symbols.txt b/config/SOUE01/rels/d_a_e_hydraNP/symbols.txt index 361973cf..ff70c377 100644 --- a/config/SOUE01/rels/d_a_e_hydraNP/symbols.txt +++ b/config/SOUE01/rels/d_a_e_hydraNP/symbols.txt @@ -132,10 +132,10 @@ g_profile_E_HYDRA = .data:0x00000010; // type:object size:0x10 lbl_182_data_20 = .data:0x00000020; // type:object size:0x8 lbl_182_data_28 = .data:0x00000028; // type:object size:0x8 lbl_182_data_30 = .data:0x00000030; // type:object size:0x14 -lbl_182_data_44 = .data:0x00000044; // type:object size:0xC +s_HydraHeadC_80afb144 = .data:0x00000044; // type:object size:0xC lbl_182_data_50 = .data:0x00000050; // type:object size:0xC lbl_182_data_5C = .data:0x0000005C; // type:object size:0x18 -lbl_182_data_74 = .data:0x00000074; // type:object size:0x10 +s_HydraEyeC_mat_80afb174 = .data:0x00000074; // type:object size:0x10 lbl_182_data_84 = .data:0x00000084; // type:object size:0x10 lbl_182_data_94 = .data:0x00000094; // type:object size:0x1C lbl_182_data_B0 = .data:0x000000B0; // type:object size:0x8 diff --git a/config/SOUE01/rels/d_a_e_ksNP/symbols.txt b/config/SOUE01/rels/d_a_e_ksNP/symbols.txt index 05525525..869b3ba7 100644 --- a/config/SOUE01/rels/d_a_e_ksNP/symbols.txt +++ b/config/SOUE01/rels/d_a_e_ksNP/symbols.txt @@ -174,7 +174,7 @@ lbl_155_data_188 = .data:0x00000188; // type:object size:0x8 lbl_155_data_190 = .data:0x00000190; // type:object size:0x8 data:string lbl_155_data_198 = .data:0x00000198; // type:object size:0x4 data:4byte lbl_155_data_19C = .data:0x0000019C; // type:object size:0x4 data:4byte -lbl_155_data_1A0 = .data:0x000001A0; // type:object size:0x90 +AcEKs__vtable = .data:0x000001A0; // type:object size:0x90 lbl_155_data_230 = .data:0x00000230; // type:object size:0x30 lbl_155_data_260 = .data:0x00000260; // type:object size:0x30 lbl_155_data_290 = .data:0x00000290; // type:object size:0x18 @@ -184,17 +184,17 @@ lbl_155_data_2CC = .data:0x000002CC; // type:object size:0x388 lbl_155_data_654 = .data:0x00000654; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_155_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_155_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_155_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_155_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_155_bss_D8 = .bss:0x000000D8; // type:object size:0x80 data:4byte -lbl_155_bss_158 = .bss:0x00000158; // type:object size:0x40 data:4byte -lbl_155_bss_198 = .bss:0x00000198; // type:object size:0x40 data:4byte -lbl_155_bss_1D8 = .bss:0x000001D8; // type:object size:0x40 data:4byte -lbl_155_bss_218 = .bss:0x00000218; // type:object size:0x40 data:4byte -lbl_155_bss_258 = .bss:0x00000258; // type:object size:0x40 data:4byte -lbl_155_bss_298 = .bss:0x00000298; // type:object size:0x40 data:4byte -lbl_155_bss_2D8 = .bss:0x000002D8; // type:object size:0xB0 data:4byte +AcEKs__StateID_Wait = .bss:0x00000018; // type:object size:0x40 data:4byte +AcEKs__StateID_WakeUp = .bss:0x00000058; // type:object size:0x40 data:4byte +AcEKs__StateID_ReturnToWait = .bss:0x00000098; // type:object size:0x40 data:4byte +AcEKs__StateID_WaitReady = .bss:0x000000D8; // type:object size:0x80 data:4byte +AcEKs__StateID_Chase = .bss:0x00000158; // type:object size:0x40 data:4byte +AcEKs__StateID_ChaseAttack = .bss:0x00000198; // type:object size:0x40 data:4byte +AcEKs__StateID_Fighting = .bss:0x000001D8; // type:object size:0x40 data:4byte +AcEKs__StateID_AttackReady = .bss:0x00000218; // type:object size:0x40 data:4byte +AcEKs__StateID_Attack = .bss:0x00000258; // type:object size:0x40 data:4byte +AcEKs__StateID_Damage = .bss:0x00000298; // type:object size:0x40 data:4byte +AcEKs__StateID_Stun = .bss:0x000002D8; // type:object size:0xB0 data:4byte lbl_155_bss_388 = .bss:0x00000388; // type:object size:0x1 data:byte lbl_155_bss_389 = .bss:0x00000389; // type:object size:0x1 data:byte lbl_155_bss_38A = .bss:0x0000038A; // type:object size:0x1 data:byte diff --git a/config/SOUE01/rels/d_a_e_phNP/symbols.txt b/config/SOUE01/rels/d_a_e_phNP/symbols.txt index 6275c07b..2c1df0d5 100644 --- a/config/SOUE01/rels/d_a_e_phNP/symbols.txt +++ b/config/SOUE01/rels/d_a_e_phNP/symbols.txt @@ -67,7 +67,7 @@ lbl_192_data_60 = .data:0x00000060; // type:object size:0x28 lbl_192_data_88 = .data:0x00000088; // type:object size:0x30 lbl_192_data_B8 = .data:0x000000B8; // type:object size:0x48 data:4byte lbl_192_data_100 = .data:0x00000100; // type:object size:0x10 data:string -lbl_192_data_110 = .data:0x00000110; // type:object size:0x90 +AcEPh__vtable = .data:0x00000110; // type:object size:0x90 lbl_192_data_1A0 = .data:0x000001A0; // type:object size:0x70 lbl_192_data_210 = .data:0x00000210; // type:object size:0x30 lbl_192_data_240 = .data:0x00000240; // type:object size:0x30 @@ -78,7 +78,7 @@ lbl_192_data_2B8 = .data:0x000002B8; // type:object size:0x88 lbl_192_data_340 = .data:0x00000340; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_192_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_192_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_192_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcEPh__StateID_Stop = .bss:0x00000018; // type:object size:0x40 data:4byte +AcEPh__StateID_PathMove = .bss:0x00000058; // type:object size:0x30 data:4byte lbl_192_bss_88 = .bss:0x00000088; // type:object size:0x4 data:4byte lbl_192_bss_8C = .bss:0x0000008C; // type:object size:0x14 data:byte diff --git a/config/SOUE01/rels/d_a_e_rupee_gueNP/symbols.txt b/config/SOUE01/rels/d_a_e_rupee_gueNP/symbols.txt index f42f7ce9..22b08bad 100644 --- a/config/SOUE01/rels/d_a_e_rupee_gueNP/symbols.txt +++ b/config/SOUE01/rels/d_a_e_rupee_gueNP/symbols.txt @@ -93,7 +93,7 @@ lbl_214_data_A0 = .data:0x000000A0; // type:object size:0x28 lbl_214_data_C8 = .data:0x000000C8; // type:object size:0x4 data:4byte lbl_214_data_CC = .data:0x000000CC; // type:object size:0x4 data:4byte lbl_214_data_D0 = .data:0x000000D0; // type:object size:0x4 data:4byte -lbl_214_data_D4 = .data:0x000000D4; // type:object size:0x8C +AcERupeeGue__vtable = .data:0x000000D4; // type:object size:0x8C lbl_214_data_160 = .data:0x00000160; // type:object size:0x30 lbl_214_data_190 = .data:0x00000190; // type:object size:0x30 lbl_214_data_1C0 = .data:0x000001C0; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_e_stNP/symbols.txt b/config/SOUE01/rels/d_a_e_stNP/symbols.txt index b3dc6679..313cf6cf 100644 --- a/config/SOUE01/rels/d_a_e_stNP/symbols.txt +++ b/config/SOUE01/rels/d_a_e_stNP/symbols.txt @@ -315,27 +315,27 @@ lbl_149_data_EA4 = .data:0x00000EA4; // type:object size:0xC __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_149_bss_8 = .bss:0x00000008; // type:object size:0x1 lbl_149_bss_9 = .bss:0x00000009; // type:object size:0x4F data:byte -lbl_149_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_149_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_149_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_149_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_149_bss_158 = .bss:0x00000158; // type:object size:0x40 data:4byte -lbl_149_bss_198 = .bss:0x00000198; // type:object size:0x40 data:4byte -lbl_149_bss_1D8 = .bss:0x000001D8; // type:object size:0x40 data:4byte -lbl_149_bss_218 = .bss:0x00000218; // type:object size:0x40 data:4byte -lbl_149_bss_258 = .bss:0x00000258; // type:object size:0xC0 data:4byte -lbl_149_bss_318 = .bss:0x00000318; // type:object size:0x80 data:4byte -lbl_149_bss_398 = .bss:0x00000398; // type:object size:0x40 data:4byte -lbl_149_bss_3D8 = .bss:0x000003D8; // type:object size:0x40 data:4byte -lbl_149_bss_418 = .bss:0x00000418; // type:object size:0x100 data:4byte -lbl_149_bss_518 = .bss:0x00000518; // type:object size:0x40 data:4byte -lbl_149_bss_558 = .bss:0x00000558; // type:object size:0x80 data:4byte -lbl_149_bss_5D8 = .bss:0x000005D8; // type:object size:0x40 data:4byte -lbl_149_bss_618 = .bss:0x00000618; // type:object size:0x40 data:4byte -lbl_149_bss_658 = .bss:0x00000658; // type:object size:0x40 data:4byte -lbl_149_bss_698 = .bss:0x00000698; // type:object size:0x40 data:4byte -lbl_149_bss_6D8 = .bss:0x000006D8; // type:object size:0x40 data:4byte -lbl_149_bss_718 = .bss:0x00000718; // type:object size:0x70 data:4byte +AcEst__STATE_HOME_LINE = .bss:0x00000058; // type:object size:0x40 data:4byte +AcEst__STATE_HANG_HIDE = .bss:0x00000098; // type:object size:0x40 data:4byte +AcEst__STATE_HANG_WAIT = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcEst__STATE_HANG_ATTACK = .bss:0x00000118; // type:object size:0x40 data:4byte +AcEst__STATE_HANG_STUN = .bss:0x00000158; // type:object size:0x40 data:4byte +AcEst__STATE_DROP = .bss:0x00000198; // type:object size:0x40 data:4byte +AcEst__STATE_NORMAL_WALK = .bss:0x000001D8; // type:object size:0x40 data:4byte +AcEst__STATE_NORMAL_WAIT = .bss:0x00000218; // type:object size:0x40 data:4byte +AcEst__STATE_FIGHT = .bss:0x00000258; // type:object size:0xC0 data:4byte +AcEst__STATE_HUG = .bss:0x00000318; // type:object size:0x80 data:4byte +AcEst__STATE_CANCEL_HUG = .bss:0x00000398; // type:object size:0x40 data:4byte +AcEst__STATE_STUN = .bss:0x000003D8; // type:object size:0x40 data:4byte +AcEst__STATE_STAND_END = .bss:0x00000418; // type:object size:0x100 data:4byte +AcEst__STATE_DEAD = .bss:0x00000518; // type:object size:0x40 data:4byte +AcEst__STATE_WATER_DEAD = .bss:0x00000558; // type:object size:0x80 data:4byte +AcEst__STATE_REVERSE = .bss:0x000005D8; // type:object size:0x40 data:4byte +AcEst__STATE_SPIDER_WAIT = .bss:0x00000618; // type:object size:0x40 data:4byte +AcEst__STATE_SPIDER_MOVE = .bss:0x00000658; // type:object size:0x40 data:4byte +AcEst__STATE_SPIDER_ATTACK = .bss:0x00000698; // type:object size:0x40 data:4byte +AcEst__STATE_SPIDER_HOME = .bss:0x000006D8; // type:object size:0x40 data:4byte +AcEst__STATE_SPDER_FANG = .bss:0x00000718; // type:object size:0x70 data:4byte lbl_149_bss_788 = .bss:0x00000788; // type:object size:0x1 data:byte lbl_149_bss_78C = .bss:0x0000078C; // type:object size:0xC data:float lbl_149_bss_798 = .bss:0x00000798; // type:object size:0x1 data:byte diff --git a/config/SOUE01/rels/d_a_e_wsNP/symbols.txt b/config/SOUE01/rels/d_a_e_wsNP/symbols.txt index 532df5f7..ec26f3c7 100644 --- a/config/SOUE01/rels/d_a_e_wsNP/symbols.txt +++ b/config/SOUE01/rels/d_a_e_wsNP/symbols.txt @@ -125,13 +125,13 @@ lbl_225_data_1F8 = .data:0x000001F8; // type:object size:0x2C0 lbl_225_data_4B8 = .data:0x000004B8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_225_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_225_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_225_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_225_bss_98 = .bss:0x00000098; // type:object size:0x100 data:4byte -lbl_225_bss_198 = .bss:0x00000198; // type:object size:0x40 data:4byte -lbl_225_bss_1D8 = .bss:0x000001D8; // type:object size:0x80 data:4byte -lbl_225_bss_258 = .bss:0x00000258; // type:object size:0x40 data:4byte -lbl_225_bss_298 = .bss:0x00000298; // type:object size:0x30 data:4byte +AcEws__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcEws__STATE_MOVE = .bss:0x00000058; // type:object size:0x40 data:4byte +AcEws__STATE_PY_MOVE = .bss:0x00000098; // type:object size:0x100 data:4byte +AcEws__STATE_HUG = .bss:0x00000198; // type:object size:0x40 data:4byte +AcEws__STATE_RETURN_JUMP = .bss:0x000001D8; // type:object size:0x80 data:4byte +AcEws__STATE_ESCAPE = .bss:0x00000258; // type:object size:0x40 data:4byte +AcEws__STATE_DEAD = .bss:0x00000298; // type:object size:0x30 data:4byte lbl_225_bss_2C8 = .bss:0x000002C8; // type:object size:0x1 data:byte lbl_225_bss_2C9 = .bss:0x000002C9; // type:object size:0x1 data:byte lbl_225_bss_2CC = .bss:0x000002CC; // type:object size:0xC data:float diff --git a/config/SOUE01/rels/d_a_heartfNP/symbols.txt b/config/SOUE01/rels/d_a_heartfNP/symbols.txt index 3bd92f14..7866c040 100644 --- a/config/SOUE01/rels/d_a_heartfNP/symbols.txt +++ b/config/SOUE01/rels/d_a_heartfNP/symbols.txt @@ -95,7 +95,7 @@ lbl_271_data_B0 = .data:0x000000B0; // type:object size:0x4 lbl_271_data_B4 = .data:0x000000B4; // type:object size:0x4 lbl_271_data_B8 = .data:0x000000B8; // type:object size:0x4 lbl_271_data_BC = .data:0x000000BC; // type:object size:0x14 -lbl_271_data_D0 = .data:0x000000D0; // type:object size:0x80 +AcHeartf__vtable = .data:0x000000D0; // type:object size:0x80 lbl_271_data_150 = .data:0x00000150; // type:object size:0x30 lbl_271_data_180 = .data:0x00000180; // type:object size:0x30 lbl_271_data_1B0 = .data:0x000001B0; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_insect_grasshopperNP/symbols.txt b/config/SOUE01/rels/d_a_insect_grasshopperNP/symbols.txt index 1a4ffba2..7acd15c4 100644 --- a/config/SOUE01/rels/d_a_insect_grasshopperNP/symbols.txt +++ b/config/SOUE01/rels/d_a_insect_grasshopperNP/symbols.txt @@ -113,7 +113,7 @@ lbl_532_data_38 = .data:0x00000038; // type:object size:0x18 lbl_532_data_50 = .data:0x00000050; // type:object size:0x18 lbl_532_data_68 = .data:0x00000068; // type:object size:0x18 lbl_532_data_80 = .data:0x00000080; // type:object size:0xC -lbl_532_data_8C = .data:0x0000008C; // type:object size:0x14 data:string +s_InsectKamakiri_walk_80e8326c = .data:0x0000008C; // type:object size:0x14 data:string lbl_532_data_A0 = .data:0x000000A0; // type:object size:0x14 data:string lbl_532_data_B4 = .data:0x000000B4; // type:object size:0x14 lbl_532_data_C8 = .data:0x000000C8; // type:object size:0x10 diff --git a/config/SOUE01/rels/d_a_messageNP/symbols.txt b/config/SOUE01/rels/d_a_messageNP/symbols.txt index 2c941d4c..78a5ab23 100644 --- a/config/SOUE01/rels/d_a_messageNP/symbols.txt +++ b/config/SOUE01/rels/d_a_messageNP/symbols.txt @@ -17,4 +17,4 @@ lbl_634_rodata_30 = .rodata:0x00000030; // type:object size:0x4 data:float lbl_634_rodata_38 = .rodata:0x00000038; // type:object size:0x8 data:double g_profile_MESSAGE_ACTOR = .data:0x00000000; // type:object size:0x10 lbl_634_data_10 = .data:0x00000010; // type:object size:0x10 -lbl_634_data_20 = .data:0x00000020; // type:object size:0x80 +AcOMessage__vtable = .data:0x00000020; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_morita_testNP/symbols.txt b/config/SOUE01/rels/d_a_morita_testNP/symbols.txt index baf5b030..278ca518 100644 --- a/config/SOUE01/rels/d_a_morita_testNP/symbols.txt +++ b/config/SOUE01/rels/d_a_morita_testNP/symbols.txt @@ -116,7 +116,7 @@ lbl_144_data_1B8 = .data:0x000001B8; // type:object size:0x10 lbl_144_data_1C8 = .data:0x000001C8; // type:object size:0x10 lbl_144_data_1D8 = .data:0x000001D8; // type:object size:0x38 lbl_144_data_210 = .data:0x00000210; // type:object size:0x14 -lbl_144_data_224 = .data:0x00000224; // type:object size:0x8C +AcMoritaTest__vtable = .data:0x00000224; // type:object size:0x8C lbl_144_data_2B0 = .data:0x000002B0; // type:object size:0x70 lbl_144_data_320 = .data:0x00000320; // type:object size:0x30 lbl_144_data_350 = .data:0x00000350; // type:object size:0x30 diff --git a/config/SOUE01/rels/d_a_npc_akumakunNP/symbols.txt b/config/SOUE01/rels/d_a_npc_akumakunNP/symbols.txt index 41a5438e..2d911fe6 100644 --- a/config/SOUE01/rels/d_a_npc_akumakunNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_akumakunNP/symbols.txt @@ -286,7 +286,7 @@ lbl_86_data_320 = .data:0x00000320; // type:object size:0x8 data:string lbl_86_data_328 = .data:0x00000328; // type:object size:0x58 lbl_86_data_380 = .data:0x00000380; // type:object size:0x14 lbl_86_data_394 = .data:0x00000394; // type:object size:0x14 data:string -lbl_86_data_3A8 = .data:0x000003A8; // type:object size:0x360 +NpcAkumakun__vtable = .data:0x000003A8; // type:object size:0x360 lbl_86_data_708 = .data:0x00000708; // type:object size:0xC lbl_86_data_714 = .data:0x00000714; // type:object size:0x24 lbl_86_data_738 = .data:0x00000738; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_npc_aqua_dragonNP/symbols.txt b/config/SOUE01/rels/d_a_npc_aqua_dragonNP/symbols.txt index c2adc8f6..b6e91f4e 100644 --- a/config/SOUE01/rels/d_a_npc_aqua_dragonNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_aqua_dragonNP/symbols.txt @@ -342,7 +342,7 @@ lbl_74_data_544 = .data:0x00000544; // type:object size:0x14 data:string lbl_74_data_558 = .data:0x00000558; // type:object size:0x1C lbl_74_data_574 = .data:0x00000574; // type:object size:0x8 lbl_74_data_57C = .data:0x0000057C; // type:object size:0xC -lbl_74_data_588 = .data:0x00000588; // type:object size:0x360 +AcNpcAdr__vtable = .data:0x00000588; // type:object size:0x360 lbl_74_data_8E8 = .data:0x000008E8; // type:object size:0x10 lbl_74_data_8F8 = .data:0x000008F8; // type:object size:0x18 lbl_74_data_910 = .data:0x00000910; // type:object size:0xC diff --git a/config/SOUE01/rels/d_a_npc_bamboo_goronNP/symbols.txt b/config/SOUE01/rels/d_a_npc_bamboo_goronNP/symbols.txt index 9776112d..48e6f515 100644 --- a/config/SOUE01/rels/d_a_npc_bamboo_goronNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_bamboo_goronNP/symbols.txt @@ -301,7 +301,7 @@ lbl_84_data_3C8 = .data:0x000003C8; // type:object size:0xC lbl_84_data_3D4 = .data:0x000003D4; // type:object size:0x10 lbl_84_data_3E4 = .data:0x000003E4; // type:object size:0x10 lbl_84_data_3F4 = .data:0x000003F4; // type:object size:0x34 -lbl_84_data_428 = .data:0x00000428; // type:object size:0x360 +AcNpcBgr__vtable = .data:0x00000428; // type:object size:0x360 lbl_84_data_788 = .data:0x00000788; // type:object size:0xC lbl_84_data_794 = .data:0x00000794; // type:object size:0xC lbl_84_data_7A0 = .data:0x000007A0; // type:object size:0x24 diff --git a/config/SOUE01/rels/d_a_npc_bbrvlNP/symbols.txt b/config/SOUE01/rels/d_a_npc_bbrvlNP/symbols.txt index 2f7b8a64..bc838a4a 100644 --- a/config/SOUE01/rels/d_a_npc_bbrvlNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_bbrvlNP/symbols.txt @@ -639,7 +639,7 @@ lbl_127_data_EFC = .data:0x00000EFC; // type:object size:0xC data:4byte lbl_127_data_F08 = .data:0x00000F08; // type:object size:0x6C data:4byte jumptable_127_data_F74 = .data:0x00000F74; // type:object size:0x28 scope:local jumptable_127_data_FB4 = .data:0x00000FB4; // type:object size:0x20 scope:local -lbl_127_data_FD8 = .data:0x00000FD8; // type:object size:0x208 +AcNpcBBRvl__vtable = .data:0x00000FD8; // type:object size:0x208 lbl_127_data_11E0 = .data:0x000011E0; // type:object size:0x70 lbl_127_data_1250 = .data:0x00001250; // type:object size:0xC lbl_127_data_125C = .data:0x0000125C; // type:object size:0xC @@ -649,26 +649,26 @@ lbl_127_data_1D08 = .data:0x00001D08; // type:object size:0x34 lbl_127_data_1D3C = .data:0x00001D3C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_127_bss_8 = .bss:0x00000008; // type:object size:0x18 data:4byte -lbl_127_bss_20 = .bss:0x00000020; // type:object size:0x40 data:4byte -lbl_127_bss_60 = .bss:0x00000060; // type:object size:0x40 data:4byte -lbl_127_bss_A0 = .bss:0x000000A0; // type:object size:0x80 data:4byte -lbl_127_bss_120 = .bss:0x00000120; // type:object size:0x80 data:4byte -lbl_127_bss_1A0 = .bss:0x000001A0; // type:object size:0x80 data:4byte -lbl_127_bss_220 = .bss:0x00000220; // type:object size:0x40 data:4byte -lbl_127_bss_260 = .bss:0x00000260; // type:object size:0x80 data:4byte -lbl_127_bss_2E0 = .bss:0x000002E0; // type:object size:0x200 data:4byte -lbl_127_bss_4E0 = .bss:0x000004E0; // type:object size:0x40 data:4byte -lbl_127_bss_520 = .bss:0x00000520; // type:object size:0xC0 data:4byte -lbl_127_bss_5E0 = .bss:0x000005E0; // type:object size:0x80 data:4byte -lbl_127_bss_660 = .bss:0x00000660; // type:object size:0xC0 -lbl_127_bss_720 = .bss:0x00000720; // type:object size:0x40 data:4byte -lbl_127_bss_760 = .bss:0x00000760; // type:object size:0x80 data:4byte -lbl_127_bss_7E0 = .bss:0x000007E0; // type:object size:0x40 data:4byte -lbl_127_bss_820 = .bss:0x00000820; // type:object size:0x40 -lbl_127_bss_860 = .bss:0x00000860; // type:object size:0x40 -lbl_127_bss_8A0 = .bss:0x000008A0; // type:object size:0x40 -lbl_127_bss_8E0 = .bss:0x000008E0; // type:object size:0x40 -lbl_127_bss_920 = .bss:0x00000920; // type:object size:0x40 data:4byte -lbl_127_bss_960 = .bss:0x00000960; // type:object size:0x30 +AcNpcBBRvl__STATE_WAIT = .bss:0x00000020; // type:object size:0x40 data:4byte +AcNpcBBRvl__STATE_RIDE_WAIT = .bss:0x00000060; // type:object size:0x40 data:4byte +AcNpcBBRvl__STATE_RIDE_TURN = .bss:0x000000A0; // type:object size:0x80 data:4byte +AcNpcBBRvl__STATE_RIDE_WAGON = .bss:0x00000120; // type:object size:0x80 data:4byte +AcNpcBBRvl__STATE_RUN = .bss:0x000001A0; // type:object size:0x80 data:4byte +AcNpcBBRvl__STATE_PUT = .bss:0x00000220; // type:object size:0x40 data:4byte +AcNpcBBRvl__STATE_SUPER_DASH = .bss:0x00000260; // type:object size:0x80 data:4byte +AcNpcBBRvl__STATE_RET_TURN = .bss:0x000002E0; // type:object size:0x200 data:4byte +AcNpcBBRvl__STATE_WIND_GUARD = .bss:0x000004E0; // type:object size:0x40 data:4byte +AcNpcBBRvl__STATE_STAND = .bss:0x00000520; // type:object size:0xC0 data:4byte +AcNpcBBRvl__STATE_SECOND_DEMO = .bss:0x000005E0; // type:object size:0x80 data:4byte +AcNpcBBRvl__STATE_ESCAPE = .bss:0x00000660; // type:object size:0xC0 +AcNpcBBRvl__STATE_SHOOT_F3_DEMO = .bss:0x00000720; // type:object size:0x40 data:4byte +AcNpcBBRvl__STATE_RIDE_WAIT_WAIT = .bss:0x00000760; // type:object size:0x80 data:4byte +AcNpcBBRvl__STATE_TO_SHRINE = .bss:0x000007E0; // type:object size:0x40 data:4byte +AcNpcBBRvl__STATE_CLEAR_DEMO = .bss:0x00000820; // type:object size:0x40 +AcNpcBBRvl__STATE_OPENING_DEMO = .bss:0x00000860; // type:object size:0x40 +AcNpcBBRvl__STATE_NO_BOMB_DEMO = .bss:0x000008A0; // type:object size:0x40 +AcNpcBBRvl__STATE_ADVICE = .bss:0x000008E0; // type:object size:0x40 +AcNpcBBRvl__STATE_BATTLE_TALK = .bss:0x00000920; // type:object size:0x40 data:4byte +AcNpcBBRvl__STATE_TUTORIAL = .bss:0x00000960; // type:object size:0x30 lbl_127_bss_990 = .bss:0x00000990; // type:object size:0x8 data:byte lbl_127_bss_998 = .bss:0x00000998; // type:object size:0x10 data:float diff --git a/config/SOUE01/rels/d_a_npc_beeNP/symbols.txt b/config/SOUE01/rels/d_a_npc_beeNP/symbols.txt index 0af91e5c..d1a22800 100644 --- a/config/SOUE01/rels/d_a_npc_beeNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_beeNP/symbols.txt @@ -40,7 +40,7 @@ lbl_14_data_54 = .data:0x00000054; // type:object size:0xC lbl_14_data_60 = .data:0x00000060; // type:object size:0x10 data:4byte lbl_14_data_70 = .data:0x00000070; // type:object size:0x4 data:string lbl_14_data_74 = .data:0x00000074; // type:object size:0x28 -lbl_14_data_9C = .data:0x0000009C; // type:object size:0x8C +AcNpcBee__vtable = .data:0x0000009C; // type:object size:0x8C lbl_14_data_128 = .data:0x00000128; // type:object size:0x70 lbl_14_data_198 = .data:0x00000198; // type:object size:0x58 lbl_14_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte diff --git a/config/SOUE01/rels/d_a_npc_bird_sowomanNP/symbols.txt b/config/SOUE01/rels/d_a_npc_bird_sowomanNP/symbols.txt index 5351a731..af475d63 100644 --- a/config/SOUE01/rels/d_a_npc_bird_sowomanNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_bird_sowomanNP/symbols.txt @@ -74,7 +74,7 @@ lbl_81_data_90 = .data:0x00000090; // type:object size:0x8 data:string lbl_81_data_98 = .data:0x00000098; // type:object size:0x8 data:string lbl_81_data_A0 = .data:0x000000A0; // type:object size:0x8 lbl_81_data_A8 = .data:0x000000A8; // type:object size:0x8 -lbl_81_data_B0 = .data:0x000000B0; // type:object size:0x98 +AcNpcBdsw__vtable = .data:0x000000B0; // type:object size:0x98 lbl_81_data_148 = .data:0x00000148; // type:object size:0x30 lbl_81_data_178 = .data:0x00000178; // type:object size:0x30 lbl_81_data_1A8 = .data:0x000001A8; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_npc_desertrobotNP/symbols.txt b/config/SOUE01/rels/d_a_npc_desertrobotNP/symbols.txt index dccd8218..f98b6501 100644 --- a/config/SOUE01/rels/d_a_npc_desertrobotNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_desertrobotNP/symbols.txt @@ -349,7 +349,7 @@ lbl_31_data_708 = .data:0x00000708; // type:object size:0x4 data:4byte lbl_31_data_70C = .data:0x0000070C; // type:object size:0x2C lbl_31_data_738 = .data:0x00000738; // type:object size:0x14 data:4byte lbl_31_data_74C = .data:0x0000074C; // type:object size:0xC -lbl_31_data_758 = .data:0x00000758; // type:object size:0x360 +NpcDesertRobot__vtable = .data:0x00000758; // type:object size:0x360 lbl_31_data_AB8 = .data:0x00000AB8; // type:object size:0xC lbl_31_data_AC4 = .data:0x00000AC4; // type:object size:0xC lbl_31_data_AD0 = .data:0x00000AD0; // type:object size:0x24 diff --git a/config/SOUE01/rels/d_a_npc_dive_game_judgeNP/symbols.txt b/config/SOUE01/rels/d_a_npc_dive_game_judgeNP/symbols.txt index 804a88c1..dfaf418f 100644 --- a/config/SOUE01/rels/d_a_npc_dive_game_judgeNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_dive_game_judgeNP/symbols.txt @@ -342,7 +342,7 @@ lbl_16_data_48C = .data:0x0000048C; // type:object size:0x24 jumptable_16_data_4B0 = .data:0x000004B0; // type:object size:0x64 scope:local lbl_16_data_51C = .data:0x0000051C; // type:object size:0xC data:string lbl_16_data_528 = .data:0x00000528; // type:object size:0x10 -lbl_16_data_538 = .data:0x00000538; // type:object size:0x360 +NpcDiveGameJudge__vtable = .data:0x00000538; // type:object size:0x360 lbl_16_data_898 = .data:0x00000898; // type:object size:0xC lbl_16_data_8A4 = .data:0x000008A4; // type:object size:0x24 lbl_16_data_8C8 = .data:0x000008C8; // type:object size:0x18 @@ -350,8 +350,8 @@ lbl_16_data_8E0 = .data:0x000008E0; // type:object size:0x1AC lbl_16_data_A8C = .data:0x00000A8C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_16_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_16_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_16_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_16_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_16_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_16_bss_118 = .bss:0x00000118; // type:object size:0x30 data:4byte +NpcDiveGameJudge__STATE_SAD = .bss:0x00000018; // type:object size:0x40 data:4byte +NpcDiveGameJudge__STATE_PREWATCH = .bss:0x00000058; // type:object size:0x40 data:4byte +NpcDiveGameJudge__STATE_WATCH = .bss:0x00000098; // type:object size:0x40 data:4byte +NpcDiveGameJudge__STATE_ESCAPE = .bss:0x000000D8; // type:object size:0x40 data:4byte +NpcDiveGameJudge__ESCAPE_END = .bss:0x00000118; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_npc_douguyanightNP/symbols.txt b/config/SOUE01/rels/d_a_npc_douguyanightNP/symbols.txt index 01886156..c0f93c87 100644 --- a/config/SOUE01/rels/d_a_npc_douguyanightNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_douguyanightNP/symbols.txt @@ -256,7 +256,7 @@ lbl_45_data_3D8 = .data:0x000003D8; // type:object size:0x10 lbl_45_data_3E8 = .data:0x000003E8; // type:object size:0x8 data:string lbl_45_data_3F0 = .data:0x000003F0; // type:object size:0x10 lbl_45_data_400 = .data:0x00000400; // type:object size:0x28 -lbl_45_data_428 = .data:0x00000428; // type:object size:0x360 +AcNpcDouguyaNight__vtable = .data:0x00000428; // type:object size:0x360 lbl_45_data_788 = .data:0x00000788; // type:object size:0xC lbl_45_data_794 = .data:0x00000794; // type:object size:0xC lbl_45_data_7A0 = .data:0x000007A0; // type:object size:0xC diff --git a/config/SOUE01/rels/d_a_npc_honeycombNP/symbols.txt b/config/SOUE01/rels/d_a_npc_honeycombNP/symbols.txt index 6c36dce3..e941f14f 100644 --- a/config/SOUE01/rels/d_a_npc_honeycombNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_honeycombNP/symbols.txt @@ -26,7 +26,7 @@ lbl_15_data_3C = .data:0x0000003C; // type:object size:0x4 data:string lbl_15_data_40 = .data:0x00000040; // type:object size:0x8 lbl_15_data_48 = .data:0x00000048; // type:object size:0x18 data:string lbl_15_data_60 = .data:0x00000060; // type:object size:0xC data:4byte -lbl_15_data_6C = .data:0x0000006C; // type:object size:0x8C +AcNpcHc__vtable = .data:0x0000006C; // type:object size:0x8C lbl_15_data_F8 = .data:0x000000F8; // type:object size:0x70 lbl_15_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte lbl_15_bss_C = .bss:0x0000000C; // type:object size:0xC data:float diff --git a/config/SOUE01/rels/d_a_npc_insect_capture_game_kobunNP/symbols.txt b/config/SOUE01/rels/d_a_npc_insect_capture_game_kobunNP/symbols.txt index b5584b89..4ee22792 100644 --- a/config/SOUE01/rels/d_a_npc_insect_capture_game_kobunNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_insect_capture_game_kobunNP/symbols.txt @@ -263,7 +263,7 @@ lbl_66_data_20 = .data:0x00000020; // type:object size:0x4 data:4byte lbl_66_data_24 = .data:0x00000024; // type:object size:0x4 data:4byte lbl_66_data_28 = .data:0x00000028; // type:object size:0x4 data:4byte lbl_66_data_2C = .data:0x0000002C; // type:object size:0x4 data:4byte -lbl_66_data_30 = .data:0x00000030; // type:object size:0x10 data:string +s_StartInsectGame_807e3478 = .data:0x00000030; // type:object size:0x10 data:string lbl_66_data_40 = .data:0x00000040; // type:object size:0x10 lbl_66_data_50 = .data:0x00000050; // type:object size:0x14 lbl_66_data_64 = .data:0x00000064; // type:object size:0x14 @@ -315,7 +315,7 @@ lbl_66_data_38C = .data:0x0000038C; // type:object size:0xC data:4byte lbl_66_data_398 = .data:0x00000398; // type:object size:0xC data:4byte lbl_66_data_3A4 = .data:0x000003A4; // type:object size:0xC data:4byte lbl_66_data_3B0 = .data:0x000003B0; // type:object size:0x40 data:4byte -lbl_66_data_3F0 = .data:0x000003F0; // type:object size:0x360 +AcNpcIcgKobun__vtable = .data:0x000003F0; // type:object size:0x360 lbl_66_data_750 = .data:0x00000750; // type:object size:0xC lbl_66_data_75C = .data:0x0000075C; // type:object size:0x24 lbl_66_data_780 = .data:0x00000780; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_npc_kenseiNP/symbols.txt b/config/SOUE01/rels/d_a_npc_kenseiNP/symbols.txt index 67672a19..6266d954 100644 --- a/config/SOUE01/rels/d_a_npc_kenseiNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_kenseiNP/symbols.txt @@ -344,7 +344,7 @@ lbl_13_data_408 = .data:0x00000408; // type:object size:0x18 lbl_13_data_420 = .data:0x00000420; // type:object size:0x8 lbl_13_data_428 = .data:0x00000428; // type:object size:0x10 data:4byte lbl_13_data_438 = .data:0x00000438; // type:object size:0x10 data:string -lbl_13_data_448 = .data:0x00000448; // type:object size:0x360 +AcNpcKensei__vtable = .data:0x00000448; // type:object size:0x360 lbl_13_data_7A8 = .data:0x000007A8; // type:object size:0xC lbl_13_data_7B4 = .data:0x000007B4; // type:object size:0xC lbl_13_data_7C0 = .data:0x000007C0; // type:object size:0xC @@ -356,11 +356,11 @@ lbl_13_data_A28 = .data:0x00000A28; // type:object size:0x34 lbl_13_data_A5C = .data:0x00000A5C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_13_bss_8 = .bss:0x00000008; // type:object size:0xC data:4byte -lbl_13_bss_14 = .bss:0x00000014; // type:object size:0x44 data:4byte -lbl_13_bss_58 = .bss:0x00000058; // type:object size:0x80 data:4byte -lbl_13_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_13_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_13_bss_158 = .bss:0x00000158; // type:object size:0x40 data:4byte -lbl_13_bss_198 = .bss:0x00000198; // type:object size:0x30 data:4byte +AcNpcKensei__STATE_WAIT = .bss:0x00000014; // type:object size:0x44 data:4byte +AcNpcKensei__STATE_LEAD_INIT = .bss:0x00000058; // type:object size:0x80 data:4byte +AcNpcKensei__STATE_LEAD = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcNpcKensei__STATE_DEMO_WAIT = .bss:0x00000118; // type:object size:0x40 data:4byte +AcNpcKensei__STATE_DEMO_REQ = .bss:0x00000158; // type:object size:0x40 data:4byte +AcNpcKensei__STATE_KILL = .bss:0x00000198; // type:object size:0x30 data:4byte lbl_13_bss_1C8 = .bss:0x000001C8; // type:object size:0x1 data:byte lbl_13_bss_1CC = .bss:0x000001CC; // type:object size:0xC data:float diff --git a/config/SOUE01/rels/d_a_npc_kobunNP/symbols.txt b/config/SOUE01/rels/d_a_npc_kobunNP/symbols.txt index ce0507a5..4eee6b1f 100644 --- a/config/SOUE01/rels/d_a_npc_kobunNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_kobunNP/symbols.txt @@ -390,7 +390,7 @@ lbl_23_data_614 = .data:0x00000614; // type:object size:0x8 lbl_23_data_61C = .data:0x0000061C; // type:object size:0x14 data:string lbl_23_data_630 = .data:0x00000630; // type:object size:0x8 data:string jumptable_23_data_638 = .data:0x00000638; // type:object size:0x94 scope:local -lbl_23_data_710 = .data:0x00000710; // type:object size:0x360 +AcNpcKbn__vtable = .data:0x00000710; // type:object size:0x360 lbl_23_data_A70 = .data:0x00000A70; // type:object size:0xC lbl_23_data_A7C = .data:0x00000A7C; // type:object size:0x24 lbl_23_data_AA0 = .data:0x00000AA0; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_npc_kyui4NP/symbols.txt b/config/SOUE01/rels/d_a_npc_kyui4NP/symbols.txt index 5d56f448..7291b2ee 100644 --- a/config/SOUE01/rels/d_a_npc_kyui4NP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_kyui4NP/symbols.txt @@ -184,7 +184,7 @@ lbl_41_data_2C = .data:0x0000002C; // type:object size:0x4 data:4byte g_profile_NPC_KYUI4 = .data:0x00000030; // type:object size:0x10 lbl_41_data_40 = .data:0x00000040; // type:object size:0x1C lbl_41_data_5C = .data:0x0000005C; // type:object size:0x4 data:4byte -lbl_41_data_60 = .data:0x00000060; // type:object size:0x3C8 +AcNpcKyui4__vtable = .data:0x00000060; // type:object size:0x3C8 lbl_41_data_428 = .data:0x00000428; // type:object size:0xC lbl_41_data_434 = .data:0x00000434; // type:object size:0xC lbl_41_data_440 = .data:0x00000440; // type:object size:0xC @@ -196,8 +196,8 @@ lbl_41_data_600 = .data:0x00000600; // type:object size:0x34 lbl_41_data_634 = .data:0x00000634; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_41_bss_8 = .bss:0x00000008; // type:object size:0x18 data:4byte -lbl_41_bss_20 = .bss:0x00000020; // type:object size:0x40 data:4byte -lbl_41_bss_60 = .bss:0x00000060; // type:object size:0x40 data:4byte -lbl_41_bss_A0 = .bss:0x000000A0; // type:object size:0x40 data:4byte -lbl_41_bss_E0 = .bss:0x000000E0; // type:object size:0x40 data:4byte -lbl_41_bss_120 = .bss:0x00000120; // type:object size:0x30 data:4byte +AcNpcKyui4__STATE_WAIT = .bss:0x00000020; // type:object size:0x40 data:4byte +AcNpcKyui4__STATE_HIDE = .bss:0x00000060; // type:object size:0x40 data:4byte +AcNpcKyui4__STATE_SEEK = .bss:0x000000A0; // type:object size:0x40 data:4byte +AcNpcKyui4__STATE_FLEE = .bss:0x000000E0; // type:object size:0x40 data:4byte +AcNpcKyui4__STATE_TEST = .bss:0x00000120; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_npc_kyui_elderNP/symbols.txt b/config/SOUE01/rels/d_a_npc_kyui_elderNP/symbols.txt index 52839b9a..817ee041 100644 --- a/config/SOUE01/rels/d_a_npc_kyui_elderNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_kyui_elderNP/symbols.txt @@ -250,8 +250,8 @@ lbl_39_data_168 = .data:0x00000168; // type:object size:0x18 data:string lbl_39_data_180 = .data:0x00000180; // type:object size:0x54 lbl_39_data_1D4 = .data:0x000001D4; // type:object size:0x20 lbl_39_data_1F4 = .data:0x000001F4; // type:object size:0x68 -lbl_39_data_25C = .data:0x0000025C; // type:object size:0x4 -lbl_39_data_260 = .data:0x00000260; // type:object size:0x3C8 +AcNpcKyuiElder__POST_SLINGSHOT_TALK = .data:0x0000025C; // type:object size:0x4 +AcNpcKyuiElder__vtable = .data:0x00000260; // type:object size:0x3C8 lbl_39_data_628 = .data:0x00000628; // type:object size:0xC lbl_39_data_634 = .data:0x00000634; // type:object size:0xC lbl_39_data_640 = .data:0x00000640; // type:object size:0x24 @@ -261,5 +261,5 @@ lbl_39_data_730 = .data:0x00000730; // type:object size:0x34 lbl_39_data_764 = .data:0x00000764; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_39_bss_8 = .bss:0x00000008; // type:object size:0xC data:4byte -lbl_39_bss_14 = .bss:0x00000014; // type:object size:0x44 data:4byte -lbl_39_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcNpcKyuiElder__StateID_Wait = .bss:0x00000014; // type:object size:0x44 data:4byte +AcNpcKyuiElder__StateID_Hide = .bss:0x00000058; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_npc_kyui_thirdNP/symbols.txt b/config/SOUE01/rels/d_a_npc_kyui_thirdNP/symbols.txt index 7b5129bc..ba1ede63 100644 --- a/config/SOUE01/rels/d_a_npc_kyui_thirdNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_kyui_thirdNP/symbols.txt @@ -170,7 +170,7 @@ lbl_40_data_7C = .data:0x0000007C; // type:object size:0x30 lbl_40_data_AC = .data:0x000000AC; // type:object size:0x8 lbl_40_data_B4 = .data:0x000000B4; // type:object size:0x4 lbl_40_data_B8 = .data:0x000000B8; // type:object size:0x8 -lbl_40_data_C0 = .data:0x000000C0; // type:object size:0x3C8 +Kyui_Third_NpcBase_vtable = .data:0x000000C0; // type:object size:0x3C8 lbl_40_data_488 = .data:0x00000488; // type:object size:0xC lbl_40_data_494 = .data:0x00000494; // type:object size:0xC lbl_40_data_4A0 = .data:0x000004A0; // type:object size:0xC @@ -179,6 +179,6 @@ lbl_40_data_4DC = .data:0x000004DC; // type:object size:0x100 lbl_40_data_5DC = .data:0x000005DC; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_40_bss_8 = .bss:0x00000008; // type:object size:0x18 data:4byte -lbl_40_bss_20 = .bss:0x00000020; // type:object size:0x40 data:4byte -lbl_40_bss_60 = .bss:0x00000060; // type:object size:0x40 data:4byte -lbl_40_bss_A0 = .bss:0x000000A0; // type:object size:0x30 data:4byte +AcNpcKyuiThird__STATE_WAIT = .bss:0x00000020; // type:object size:0x40 data:4byte +AcNpcKyuiThird__STATE_HANG = .bss:0x00000060; // type:object size:0x40 data:4byte +AcNpcKyuiThird__STATE_HELP = .bss:0x000000A0; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_npc_moleNP/symbols.txt b/config/SOUE01/rels/d_a_npc_moleNP/symbols.txt index 18547edf..cd304bc7 100644 --- a/config/SOUE01/rels/d_a_npc_moleNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_moleNP/symbols.txt @@ -613,7 +613,7 @@ lbl_91_data_1320 = .data:0x00001320; // type:object size:0x10 lbl_91_data_1330 = .data:0x00001330; // type:object size:0xC lbl_91_data_133C = .data:0x0000133C; // type:object size:0x14 lbl_91_data_1350 = .data:0x00001350; // type:object size:0x10 -lbl_91_data_1360 = .data:0x00001360; // type:object size:0x208 +AcNpcMole__vtable = .data:0x00001360; // type:object size:0x208 lbl_91_data_1568 = .data:0x00001568; // type:object size:0xC lbl_91_data_1574 = .data:0x00001574; // type:object size:0x30 lbl_91_data_15A4 = .data:0x000015A4; // type:object size:0x3DC @@ -622,8 +622,8 @@ lbl_91_data_19B4 = .data:0x000019B4; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_91_bss_8 = .bss:0x00000008; // type:object size:0xC data:4byte lbl_91_bss_14 = .bss:0x00000014; // type:object size:0x44 data:4byte -lbl_91_bss_58 = .bss:0x00000058; // type:object size:0xC0 data:4byte -lbl_91_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_91_bss_158 = .bss:0x00000158; // type:object size:0x40 data:4byte +AcNpcMole__STATE_RUN = .bss:0x00000058; // type:object size:0xC0 data:4byte +AcNpcMole__STATE_BACK = .bss:0x00000118; // type:object size:0x40 data:4byte +AcNpcMole__STATE_CATCH = .bss:0x00000158; // type:object size:0x40 data:4byte lbl_91_bss_198 = .bss:0x00000198; // type:object size:0xC0 data:4byte lbl_91_bss_258 = .bss:0x00000258; // type:object size:0x148 data:4byte diff --git a/config/SOUE01/rels/d_a_npc_mole_normalNP/symbols.txt b/config/SOUE01/rels/d_a_npc_mole_normalNP/symbols.txt index ce9a3863..9018dc16 100644 --- a/config/SOUE01/rels/d_a_npc_mole_normalNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_mole_normalNP/symbols.txt @@ -315,7 +315,7 @@ lbl_93_data_428 = .data:0x00000428; // type:object size:0x2C lbl_93_data_454 = .data:0x00000454; // type:object size:0x10 lbl_93_data_464 = .data:0x00000464; // type:object size:0x54 lbl_93_data_4B8 = .data:0x000004B8; // type:object size:0x18 -lbl_93_data_4D0 = .data:0x000004D0; // type:object size:0x360 +AcNpcMoleNormal__vtable = .data:0x000004D0; // type:object size:0x360 lbl_93_data_830 = .data:0x00000830; // type:object size:0xC lbl_93_data_83C = .data:0x0000083C; // type:object size:0x24 lbl_93_data_860 = .data:0x00000860; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_npc_ord_kyuiNP/symbols.txt b/config/SOUE01/rels/d_a_npc_ord_kyuiNP/symbols.txt index 6ff06bd5..8dbd51bf 100644 --- a/config/SOUE01/rels/d_a_npc_ord_kyuiNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_ord_kyuiNP/symbols.txt @@ -159,7 +159,7 @@ lbl_36_data_44 = .data:0x00000044; // type:object size:0x4 data:4byte lbl_36_data_48 = .data:0x00000048; // type:object size:0x20 lbl_36_data_68 = .data:0x00000068; // type:object size:0xC data:string lbl_36_data_74 = .data:0x00000074; // type:object size:0xC -lbl_36_data_80 = .data:0x00000080; // type:object size:0x3C8 +AcNpcOrdKyui__vtable = .data:0x00000080; // type:object size:0x3C8 lbl_36_data_448 = .data:0x00000448; // type:object size:0xC lbl_36_data_454 = .data:0x00000454; // type:object size:0xC lbl_36_data_460 = .data:0x00000460; // type:object size:0xC diff --git a/config/SOUE01/rels/d_a_npc_pumpkin_clay_shootingNP/symbols.txt b/config/SOUE01/rels/d_a_npc_pumpkin_clay_shootingNP/symbols.txt index 8ac7e499..299f36c6 100644 --- a/config/SOUE01/rels/d_a_npc_pumpkin_clay_shootingNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_pumpkin_clay_shootingNP/symbols.txt @@ -309,7 +309,7 @@ lbl_67_data_20 = .data:0x00000020; // type:object size:0x4 data:4byte lbl_67_data_24 = .data:0x00000024; // type:object size:0x4 data:4byte lbl_67_data_28 = .data:0x00000028; // type:object size:0x4 data:4byte lbl_67_data_2C = .data:0x0000002C; // type:object size:0x4 data:4byte -lbl_67_data_30 = .data:0x00000030; // type:object size:0x1C +s_StartPumpkinClayShooting_807e8eec = .data:0x00000030; // type:object size:0x1C lbl_67_data_4C = .data:0x0000004C; // type:object size:0x18 lbl_67_data_64 = .data:0x00000064; // type:object size:0x1C lbl_67_data_80 = .data:0x00000080; // type:object size:0x10 data:4byte @@ -392,7 +392,7 @@ lbl_67_data_620 = .data:0x00000620; // type:object size:0x8 data:string lbl_67_data_628 = .data:0x00000628; // type:object size:0x1C lbl_67_data_644 = .data:0x00000644; // type:object size:0x8 jumptable_67_data_64C = .data:0x0000064C; // type:object size:0x6C scope:local -lbl_67_data_6B8 = .data:0x000006B8; // type:object size:0x360 +AcNpcPcs__vtable = .data:0x000006B8; // type:object size:0x360 lbl_67_data_A18 = .data:0x00000A18; // type:object size:0xC lbl_67_data_A24 = .data:0x00000A24; // type:object size:0x24 lbl_67_data_A48 = .data:0x00000A48; // type:object size:0x18 @@ -401,7 +401,7 @@ lbl_67_data_C10 = .data:0x00000C10; // type:object size:0x34 lbl_67_data_C44 = .data:0x00000C44; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_67_bss_8 = .bss:0x00000008; // type:object size:0x50 data:4byte -lbl_67_bss_58 = .bss:0x00000058; // type:object size:0x80 data:4byte -lbl_67_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_67_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_67_bss_158 = .bss:0x00000158; // type:object size:0x58 data:4byte +AcNpcPcs__STATE_MANAGE = .bss:0x00000058; // type:object size:0x80 data:4byte +AcNpcPcs__STATE_TAKE = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcNpcPcs__STATE_HOLD = .bss:0x00000118; // type:object size:0x40 data:4byte +AcNpcPcs__STATE_THROW = .bss:0x00000158; // type:object size:0x58 data:4byte diff --git a/config/SOUE01/rels/d_a_npc_rescueNP/symbols.txt b/config/SOUE01/rels/d_a_npc_rescueNP/symbols.txt index 6e3e3daa..6d9a34cd 100644 --- a/config/SOUE01/rels/d_a_npc_rescueNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_rescueNP/symbols.txt @@ -205,7 +205,7 @@ g_profile_NPC_RESCUE = .data:0x00000118; // type:object size:0x10 lbl_107_data_128 = .data:0x00000128; // type:object size:0x8 lbl_107_data_130 = .data:0x00000130; // type:object size:0x4 lbl_107_data_134 = .data:0x00000134; // type:object size:0x4 -lbl_107_data_138 = .data:0x00000138; // type:object size:0x18 +s_CeremonyByRescueTeam_808a5e18 = .data:0x00000138; // type:object size:0x18 lbl_107_data_150 = .data:0x00000150; // type:object size:0x10 lbl_107_data_160 = .data:0x00000160; // type:object size:0x10 lbl_107_data_170 = .data:0x00000170; // type:object size:0x4 diff --git a/config/SOUE01/rels/d_a_npc_rivalNP/symbols.txt b/config/SOUE01/rels/d_a_npc_rivalNP/symbols.txt index c70d90e3..cf3e286a 100644 --- a/config/SOUE01/rels/d_a_npc_rivalNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_rivalNP/symbols.txt @@ -509,7 +509,7 @@ lbl_21_data_D98 = .data:0x00000D98; // type:object size:0x2C lbl_21_data_DC4 = .data:0x00000DC4; // type:object size:0x1C lbl_21_data_DE0 = .data:0x00000DE0; // type:object size:0x8 lbl_21_data_DE8 = .data:0x00000DE8; // type:object size:0x8 -lbl_21_data_DF0 = .data:0x00000DF0; // type:object size:0x360 +AcNpcRvl__vtable = .data:0x00000DF0; // type:object size:0x360 lbl_21_data_1150 = .data:0x00001150; // type:object size:0xC lbl_21_data_115C = .data:0x0000115C; // type:object size:0xC lbl_21_data_1168 = .data:0x00001168; // type:object size:0x24 diff --git a/config/SOUE01/rels/d_a_npc_salbage_robotNP/symbols.txt b/config/SOUE01/rels/d_a_npc_salbage_robotNP/symbols.txt index 1e37e461..f06ba860 100644 --- a/config/SOUE01/rels/d_a_npc_salbage_robotNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_salbage_robotNP/symbols.txt @@ -318,7 +318,7 @@ lbl_573_data_638 = .data:0x00000638; // type:object size:0xC lbl_573_data_644 = .data:0x00000644; // type:object size:0x18 lbl_573_data_65C = .data:0x0000065C; // type:object size:0x4 data:4byte lbl_573_data_660 = .data:0x00000660; // type:object size:0x8 -lbl_573_data_668 = .data:0x00000668; // type:object size:0x360 +AcNpcSlb__vtable = .data:0x00000668; // type:object size:0x360 lbl_573_data_9C8 = .data:0x000009C8; // type:object size:0xC lbl_573_data_9D4 = .data:0x000009D4; // type:object size:0x24 lbl_573_data_9F8 = .data:0x000009F8; // type:object size:0x18 @@ -326,10 +326,10 @@ lbl_573_data_A10 = .data:0x00000A10; // type:object size:0x180 lbl_573_data_B90 = .data:0x00000B90; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_573_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_573_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_573_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_573_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_573_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_573_bss_118 = .bss:0x00000118; // type:object size:0x30 data:4byte +AcNpcSlb__StateID_Hide = .bss:0x00000018; // type:object size:0x40 data:4byte +AcNpcSlb__StateID_HideDelivary = .bss:0x00000058; // type:object size:0x40 data:4byte +AcNpcSlb__StateID_DelivaryReq = .bss:0x00000098; // type:object size:0x40 data:4byte +AcNpcSlb__StateID_Kill = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcNpcSlb__StateID_Kill2 = .bss:0x00000118; // type:object size:0x30 data:4byte lbl_573_bss_148 = .bss:0x00000148; // type:object size:0x1 data:byte lbl_573_bss_14C = .bss:0x0000014C; // type:object size:0x2C data:float diff --git a/config/SOUE01/rels/d_a_npc_salbage_robot_flyNP/symbols.txt b/config/SOUE01/rels/d_a_npc_salbage_robot_flyNP/symbols.txt index e0422880..b7e35d00 100644 --- a/config/SOUE01/rels/d_a_npc_salbage_robot_flyNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_salbage_robot_flyNP/symbols.txt @@ -383,7 +383,7 @@ lbl_105_data_600 = .data:0x00000600; // type:object size:0x28 lbl_105_data_628 = .data:0x00000628; // type:object size:0xC lbl_105_data_634 = .data:0x00000634; // type:object size:0x4 data:4byte lbl_105_data_638 = .data:0x00000638; // type:object size:0x8 data:4byte -lbl_105_data_640 = .data:0x00000640; // type:object size:0x360 +AcNpcSalbageRobotFly__vtable = .data:0x00000640; // type:object size:0x360 lbl_105_data_9A0 = .data:0x000009A0; // type:object size:0x2C lbl_105_data_9CC = .data:0x000009CC; // type:object size:0x2C lbl_105_data_9F8 = .data:0x000009F8; // type:object size:0x2C @@ -425,7 +425,7 @@ lbl_105_bss_8 = .bss:0x00000008; // type:object size:0x8 data:4byte lbl_105_bss_10 = .bss:0x00000010; // type:object size:0x10 data:float lbl_105_bss_20 = .bss:0x00000020; // type:object size:0x8 data:byte lbl_105_bss_28 = .bss:0x00000028; // type:object size:0x20 data:float -lbl_105_bss_48 = .bss:0x00000048; // type:object size:0x40 data:4byte -lbl_105_bss_88 = .bss:0x00000088; // type:object size:0x40 data:4byte -lbl_105_bss_C8 = .bss:0x000000C8; // type:object size:0x40 data:4byte -lbl_105_bss_108 = .bss:0x00000108; // type:object size:0x30 data:4byte +AcNpcSalbageRobotFly__StateID_ChasePlayerBird = .bss:0x00000048; // type:object size:0x40 data:4byte +AcNpcSalbageRobotFly__StateID_FlyWithPlayerBird = .bss:0x00000088; // type:object size:0x40 data:4byte +AcNpcSalbageRobotFly__StateID_Leave = .bss:0x000000C8; // type:object size:0x40 data:4byte +AcNpcSalbageRobotFly__StateID_EscapeToUpward = .bss:0x00000108; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_npc_salbage_robot_repairNP/symbols.txt b/config/SOUE01/rels/d_a_npc_salbage_robot_repairNP/symbols.txt index 607dface..b20fc573 100644 --- a/config/SOUE01/rels/d_a_npc_salbage_robot_repairNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_salbage_robot_repairNP/symbols.txt @@ -287,7 +287,7 @@ lbl_104_data_5B0 = .data:0x000005B0; // type:object size:0x10 lbl_104_data_5C0 = .data:0x000005C0; // type:object size:0x10 lbl_104_data_5D0 = .data:0x000005D0; // type:object size:0x4C lbl_104_data_61C = .data:0x0000061C; // type:object size:0x24 -lbl_104_data_640 = .data:0x00000640; // type:object size:0x360 +NpcSalbageRobotRepair__AcOrdinaryNpc__vtable = .data:0x00000640; // type:object size:0x360 lbl_104_data_9A0 = .data:0x000009A0; // type:object size:0xC lbl_104_data_9AC = .data:0x000009AC; // type:object size:0x24 lbl_104_data_9D0 = .data:0x000009D0; // type:object size:0x18 @@ -297,6 +297,6 @@ lbl_104_data_AA0 = .data:0x00000AA0; // type:object size:0x20 data:string lbl_104_data_AC0 = .data:0x00000AC0; // type:object size:0x20 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_104_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_104_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +NpcSalbageRobotRepair__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte lbl_104_bss_48 = .bss:0x00000048; // type:object size:0x8 data:byte lbl_104_bss_50 = .bss:0x00000050; // type:object size:0x10 data:float diff --git a/config/SOUE01/rels/d_a_npc_salesman_sNP/symbols.txt b/config/SOUE01/rels/d_a_npc_salesman_sNP/symbols.txt index 8d2986d0..e2c5cfea 100644 --- a/config/SOUE01/rels/d_a_npc_salesman_sNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_salesman_sNP/symbols.txt @@ -1529,17 +1529,17 @@ lbl_44_data_D9C = .data:0x00000D9C; // type:object size:0xC lbl_44_data_DA8 = .data:0x00000DA8; // type:object size:0xC lbl_44_data_DB4 = .data:0x00000DB4; // type:object size:0xC g_profile_NPC_SALESMAN_S = .data:0x00000DC0; // type:object size:0x10 -lbl_44_data_DD0 = .data:0x00000DD0; // type:object size:0x30 -lbl_44_data_E00 = .data:0x00000E00; // type:object size:0x48 +dAcNpcSalesmanS__STATE_LIST = .data:0x00000DD0; // type:object size:0x30 +dAcNpcSalesmanS__RUPIN_STATES = .data:0x00000E00; // type:object size:0x48 lbl_44_data_E48 = .data:0x00000E48; // type:object size:0x8 lbl_44_data_E50 = .data:0x00000E50; // type:object size:0x8 data:string lbl_44_data_E58 = .data:0x00000E58; // type:object size:0x4 data:4byte lbl_44_data_E5C = .data:0x00000E5C; // type:object size:0x20 lbl_44_data_E7C = .data:0x00000E7C; // type:object size:0x4 lbl_44_data_E80 = .data:0x00000E80; // type:object size:0x4 -lbl_44_data_E84 = .data:0x00000E84; // type:object size:0x10 +s_AfterShopping_80794530 = .data:0x00000E84; // type:object size:0x10 lbl_44_data_E94 = .data:0x00000E94; // type:object size:0x14 -lbl_44_data_EA8 = .data:0x00000EA8; // type:object size:0x208 +dAcNpcSalesmanS__vtable = .data:0x00000EA8; // type:object size:0x208 lbl_44_data_10B0 = .data:0x000010B0; // type:object size:0x60 lbl_44_data_1110 = .data:0x00001110; // type:object size:0x30 lbl_44_data_1140 = .data:0x00001140; // type:object size:0x18 @@ -1550,17 +1550,17 @@ lbl_44_data_11A8 = .data:0x000011A8; // type:object size:0x28 lbl_44_data_11D0 = .data:0x000011D0; // type:object size:0x28 lbl_44_data_11F8 = .data:0x000011F8; // type:object size:0x50 lbl_44_data_1248 = .data:0x00001248; // type:object size:0xB0 -lbl_44_data_12F8 = .data:0x000012F8; // type:object size:0xB0 +gondoSwitchVtable = .data:0x000012F8; // type:object size:0xB0 lbl_44_data_13A8 = .data:0x000013A8; // type:object size:0xB0 lbl_44_data_1458 = .data:0x00001458; // type:object size:0xB0 lbl_44_data_1508 = .data:0x00001508; // type:object size:0x60 lbl_44_data_1568 = .data:0x00001568; // type:object size:0x60 lbl_44_data_15C8 = .data:0x000015C8; // type:object size:0x60 -lbl_44_data_1628 = .data:0x00001628; // type:object size:0xB0 -lbl_44_data_16D8 = .data:0x000016D8; // type:object size:0xB0 +potionWifeSwitchVtable = .data:0x00001628; // type:object size:0xB0 +rupinSwitchVtable = .data:0x000016D8; // type:object size:0xB0 lbl_44_data_1788 = .data:0x00001788; // type:object size:0x170 lbl_44_data_18F8 = .data:0x000018F8; // type:object size:0x114 -lbl_44_data_1A0C = .data:0x00001A0C; // type:object size:0x114 +dAcNpcSalesmanS__model_stuff_vtable = .data:0x00001A0C; // type:object size:0x114 lbl_44_data_1B20 = .data:0x00001B20; // type:object size:0x114 lbl_44_data_1C34 = .data:0x00001C34; // type:object size:0x114 lbl_44_data_1D48 = .data:0x00001D48; // type:object size:0x114 @@ -1688,26 +1688,26 @@ lbl_44_data_3240 = .data:0x00003240; // type:object size:0x14 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_44_bss_8 = .bss:0x00000008; // type:object size:0x4 data:4byte lbl_44_bss_C = .bss:0x0000000C; // type:object size:0x3C data:float -lbl_44_bss_48 = .bss:0x00000048; // type:object size:0x3C -lbl_44_bss_84 = .bss:0x00000084; // type:object size:0x44 data:4byte -lbl_44_bss_C8 = .bss:0x000000C8; // type:object size:0x40 data:4byte -lbl_44_bss_108 = .bss:0x00000108; // type:object size:0x40 data:4byte -lbl_44_bss_148 = .bss:0x00000148; // type:object size:0x40 data:4byte -lbl_44_bss_188 = .bss:0x00000188; // type:object size:0x40 data:4byte -lbl_44_bss_1C8 = .bss:0x000001C8; // type:object size:0x40 data:4byte -lbl_44_bss_208 = .bss:0x00000208; // type:object size:0x40 data:4byte -lbl_44_bss_248 = .bss:0x00000248; // type:object size:0x40 -lbl_44_bss_288 = .bss:0x00000288; // type:object size:0x40 data:4byte -lbl_44_bss_2C8 = .bss:0x000002C8; // type:object size:0x40 -lbl_44_bss_308 = .bss:0x00000308; // type:object size:0x40 data:4byte -lbl_44_bss_348 = .bss:0x00000348; // type:object size:0x40 -lbl_44_bss_388 = .bss:0x00000388; // type:object size:0x40 data:4byte -lbl_44_bss_3C8 = .bss:0x000003C8; // type:object size:0x40 data:4byte -lbl_44_bss_408 = .bss:0x00000408; // type:object size:0x40 data:4byte -lbl_44_bss_448 = .bss:0x00000448; // type:object size:0x40 data:4byte -lbl_44_bss_488 = .bss:0x00000488; // type:object size:0x100 data:4byte -lbl_44_bss_588 = .bss:0x00000588; // type:object size:0x40 data:4byte -lbl_44_bss_5C8 = .bss:0x000005C8; // type:object size:0x40 data:4byte -lbl_44_bss_608 = .bss:0x00000608; // type:object size:0x70 data:4byte +dAcNpcSalesmanS__STATE_TEST = .bss:0x00000048; // type:object size:0x3C +dAcNpcSalesmanS__STATE_WAIT = .bss:0x00000084; // type:object size:0x44 data:4byte +dAcNpcSalesmanS__STATE_INITIALIZE_STATE = .bss:0x000000C8; // type:object size:0x40 data:4byte +dAcNpcSalesmanS__STATE_FACE_FORWARD = .bss:0x00000108; // type:object size:0x40 data:4byte +dAcNpcSalesmanS__STATE_GLANCE = .bss:0x00000148; // type:object size:0x40 data:4byte +dAcNpcSalesmanS__CHANGE_DIRECTION_TO_PLAYER = .bss:0x00000188; // type:object size:0x40 data:4byte +dAcNpcSalesmanS__STATE_CHASE_PLAYER = .bss:0x000001C8; // type:object size:0x40 data:4byte +dAcNpcSalesmanS__STATE_STEP_OUT_PLAYER = .bss:0x00000208; // type:object size:0x40 data:4byte +dAcNpcSalesmanS__STATE_SALES_SHOP_ITEM_BEFORE = .bss:0x00000248; // type:object size:0x40 +dAcNpcSalesmanS__STATE_SALES_SHOP_ITEM = .bss:0x00000288; // type:object size:0x40 data:4byte +dAcNpcSalesmanS__STATE_SALES_SHOP_ITEM_AFTER = .bss:0x000002C8; // type:object size:0x40 +dAcNpcSalesmanS__STATE_AWAKE_TO_PLAYER = .bss:0x00000308; // type:object size:0x40 data:4byte +dAcNpcSalesmanS__STATE_HEKO_HEKO_TO_PLAYER = .bss:0x00000348; // type:object size:0x40 +dAcNpcSalesmanS__STATE_BEFORE_GAKKARI = .bss:0x00000388; // type:object size:0x40 data:4byte +dAcNpcSalesmanS__STATE_GAKKARI = .bss:0x000003C8; // type:object size:0x40 data:4byte +dAcNpcSalesmanS__STATE_GAKKARI_WALK = .bss:0x00000408; // type:object size:0x40 data:4byte +dAcNpcSalesmanS__STATE_GAKKARI_CHANGE_DIRECTION = .bss:0x00000448; // type:object size:0x40 data:4byte +dAcNpcSalesmanS__STATE_WAIT_MOVEMENT_FOR_CHASING = .bss:0x00000488; // type:object size:0x100 data:4byte +dAcNpcSalesmanS__STATE_WAIT_MOVEMENT_FOR_STEPPING_OUT = .bss:0x00000588; // type:object size:0x40 data:4byte +dAcNpcSalesmanS__STATE_STEP_OUT_MOVEMENT = .bss:0x000005C8; // type:object size:0x40 data:4byte +dAcNpcSalesmanS__STATE_STEP_OUT_MOVEMENT_IN_NOT_MOVABLE_AREA = .bss:0x00000608; // type:object size:0x70 data:4byte lbl_44_bss_678 = .bss:0x00000678; // type:object size:0x8 data:byte lbl_44_bss_680 = .bss:0x00000680; // type:object size:0x6C data:float diff --git a/config/SOUE01/rels/d_a_npc_sorajima_maleNP/symbols.txt b/config/SOUE01/rels/d_a_npc_sorajima_maleNP/symbols.txt index d44f9c8a..3c0c9a28 100644 --- a/config/SOUE01/rels/d_a_npc_sorajima_maleNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_sorajima_maleNP/symbols.txt @@ -195,9 +195,9 @@ lbl_9_rodata_5E0 = .rodata:0x000005E0; // type:object size:0x18 lbl_9_rodata_5F8 = .rodata:0x000005F8; // type:object size:0x4 data:float lbl_9_rodata_5FC = .rodata:0x000005FC; // type:object size:0xC data:float lbl_9_rodata_608 = .rodata:0x00000608; // type:object size:0x2 -lbl_9_rodata_60A = .rodata:0x0000060A; // type:object size:0x2 +lbl_9_rodata_608+2 = .rodata:0x0000060A; // type:object size:0x2 lbl_9_rodata_60C = .rodata:0x0000060C; // type:object size:0x2 -lbl_9_rodata_60E = .rodata:0x0000060E; // type:object size:0xA6 +lbl_9_rodata_60C+2 = .rodata:0x0000060E; // type:object size:0xA6 lbl_9_rodata_6B4 = .rodata:0x000006B4; // type:object size:0x4 data:float lbl_9_rodata_6B8 = .rodata:0x000006B8; // type:object size:0x4 data:float lbl_9_rodata_6BC = .rodata:0x000006BC; // type:object size:0x8 data:float diff --git a/config/SOUE01/rels/d_a_npc_testmanNP/symbols.txt b/config/SOUE01/rels/d_a_npc_testmanNP/symbols.txt index fedb8fd7..8e842263 100644 --- a/config/SOUE01/rels/d_a_npc_testmanNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_testmanNP/symbols.txt @@ -132,6 +132,6 @@ lbl_43_data_314 = .data:0x00000314; // type:object size:0x6C lbl_43_data_380 = .data:0x00000380; // type:object size:0x68 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_43_bss_8 = .bss:0x00000008; // type:object size:0xC -lbl_43_bss_14 = .bss:0x00000014; // type:object size:0x34 data:4byte +AcNpcTmn__STATE_WAIT = .bss:0x00000014; // type:object size:0x34 data:4byte lbl_43_bss_48 = .bss:0x00000048; // type:object size:0x8 data:byte lbl_43_bss_50 = .bss:0x00000050; // type:object size:0x10 data:float diff --git a/config/SOUE01/rels/d_a_npc_thunder_dragonNP/symbols.txt b/config/SOUE01/rels/d_a_npc_thunder_dragonNP/symbols.txt index b833d879..e96060e8 100644 --- a/config/SOUE01/rels/d_a_npc_thunder_dragonNP/symbols.txt +++ b/config/SOUE01/rels/d_a_npc_thunder_dragonNP/symbols.txt @@ -343,7 +343,7 @@ lbl_69_data_EC = .data:0x000000EC; // type:object size:0x10 lbl_69_data_FC = .data:0x000000FC; // type:object size:0x10 lbl_69_data_10C = .data:0x0000010C; // type:object size:0x10 lbl_69_data_11C = .data:0x0000011C; // type:object size:0x14 -lbl_69_data_130 = .data:0x00000130; // type:object size:0x38 +AcNpcTdr__REWARD_NAMES = .data:0x00000130; // type:object size:0x38 lbl_69_data_168 = .data:0x00000168; // type:object size:0x10 lbl_69_data_178 = .data:0x00000178; // type:object size:0x10 lbl_69_data_188 = .data:0x00000188; // type:object size:0x10 @@ -354,7 +354,7 @@ lbl_69_data_1C8 = .data:0x000001C8; // type:object size:0x10 lbl_69_data_1D8 = .data:0x000001D8; // type:object size:0x10 lbl_69_data_1E8 = .data:0x000001E8; // type:object size:0x10 lbl_69_data_1F8 = .data:0x000001F8; // type:object size:0x10 -lbl_69_data_208 = .data:0x00000208; // type:object size:0x30 +AcNpcTdr__BOSS_NAMES = .data:0x00000208; // type:object size:0x30 g_profile_NPC_TDR = .data:0x00000238; // type:object size:0x10 lbl_69_data_248 = .data:0x00000248; // type:object size:0x2C lbl_69_data_274 = .data:0x00000274; // type:object size:0x10 @@ -398,7 +398,7 @@ jumptable_69_data_678 = .data:0x00000678; // type:object size:0x58 scope:local lbl_69_data_6D0 = .data:0x000006D0; // type:object size:0x8 jumptable_69_data_6D8 = .data:0x000006D8; // type:object size:0x30 scope:local jumptable_69_data_708 = .data:0x00000708; // type:object size:0x30 scope:local -lbl_69_data_738 = .data:0x00000738; // type:object size:0x360 +AcNpcTdr__vtable = .data:0x00000738; // type:object size:0x360 lbl_69_data_A98 = .data:0x00000A98; // type:object size:0x10 lbl_69_data_AA8 = .data:0x00000AA8; // type:object size:0x20 lbl_69_data_AC8 = .data:0x00000AC8; // type:object size:0xC diff --git a/config/SOUE01/rels/d_a_obj_B300_sandNP/symbols.txt b/config/SOUE01/rels/d_a_obj_B300_sandNP/symbols.txt index 9d8f12bb..f384f7a6 100644 --- a/config/SOUE01/rels/d_a_obj_B300_sandNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_B300_sandNP/symbols.txt @@ -71,7 +71,7 @@ lbl_602_data_A8 = .data:0x000000A8; // type:object size:0x34 lbl_602_data_DC = .data:0x000000DC; // type:object size:0x1C data:string lbl_602_data_F8 = .data:0x000000F8; // type:object size:0x10 lbl_602_data_108 = .data:0x00000108; // type:object size:0x10 -lbl_602_data_118 = .data:0x00000118; // type:object size:0x80 +AcOB300Sand__vtable = .data:0x00000118; // type:object size:0x80 lbl_602_data_198 = .data:0x00000198; // type:object size:0x30 lbl_602_data_1C8 = .data:0x000001C8; // type:object size:0x30 lbl_602_data_1F8 = .data:0x000001F8; // type:object size:0x18 @@ -79,5 +79,5 @@ lbl_602_data_210 = .data:0x00000210; // type:object size:0xA0 lbl_602_data_2B0 = .data:0x000002B0; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_602_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_602_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_602_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcOB300Sand__StateID_Wait = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOB300Sand__StateID_Clear = .bss:0x00000058; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_D300NP/symbols.txt b/config/SOUE01/rels/d_a_obj_D300NP/symbols.txt index b5f1557b..ee17f5b8 100644 --- a/config/SOUE01/rels/d_a_obj_D300NP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_D300NP/symbols.txt @@ -55,7 +55,7 @@ g_profile_OBJ_D300 = .data:0x00000000; // type:object size:0x10 data:4byte lbl_490_data_10 = .data:0x00000010; // type:object size:0xC data:string lbl_490_data_1C = .data:0x0000001C; // type:object size:0x8C lbl_490_data_A8 = .data:0x000000A8; // type:object size:0x18 data:string -lbl_490_data_C0 = .data:0x000000C0; // type:object size:0x80 +AcOD300__vtable = .data:0x000000C0; // type:object size:0x80 lbl_490_data_140 = .data:0x00000140; // type:object size:0x30 lbl_490_data_170 = .data:0x00000170; // type:object size:0x30 lbl_490_data_1A0 = .data:0x000001A0; // type:object size:0x18 @@ -63,6 +63,6 @@ lbl_490_data_1B8 = .data:0x000001B8; // type:object size:0xD8 lbl_490_data_290 = .data:0x00000290; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_490_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_490_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_490_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_490_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +AcOD300__StateID_Wait = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOD300__StateID_Appear = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOD300__StateID_End = .bss:0x00000098; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_F400_gate_sealNP/symbols.txt b/config/SOUE01/rels/d_a_obj_F400_gate_sealNP/symbols.txt index 857debf3..280a5ff0 100644 --- a/config/SOUE01/rels/d_a_obj_F400_gate_sealNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_F400_gate_sealNP/symbols.txt @@ -14,4 +14,4 @@ lbl_629_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float g_profile_OBJ_F400_GATE_SEAL = .data:0x00000000; // type:object size:0x10 lbl_629_data_10 = .data:0x00000010; // type:object size:0x10 lbl_629_data_20 = .data:0x00000020; // type:object size:0x20 data:string -lbl_629_data_40 = .data:0x00000040; // type:object size:0x80 +AcOF400GateSeal__vtable = .data:0x00000040; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_ancient_jewelsNP/symbols.txt b/config/SOUE01/rels/d_a_obj_ancient_jewelsNP/symbols.txt index 3052c355..4ca47a62 100644 --- a/config/SOUE01/rels/d_a_obj_ancient_jewelsNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_ancient_jewelsNP/symbols.txt @@ -86,7 +86,7 @@ lbl_509_rodata_68 = .rodata:0x00000068; // type:object size:0x4 data:float lbl_509_rodata_6C = .rodata:0x0000006C; // type:object size:0xC data:float lbl_509_rodata_78 = .rodata:0x00000078; // type:object size:0x14 data:float lbl_509_rodata_8C = .rodata:0x0000008C; // type:object size:0xC -lbl_509_rodata_98 = .rodata:0x00000098; // type:object size:0xC +AcOAncientJewels__ITEM_DROP_TABLE = .rodata:0x00000098; // type:object size:0xC lbl_509_rodata_A4 = .rodata:0x000000A4; // type:object size:0x4 data:float lbl_509_rodata_A8 = .rodata:0x000000A8; // type:object size:0x4 data:float lbl_509_rodata_AC = .rodata:0x000000AC; // type:object size:0xC data:float @@ -94,7 +94,7 @@ g_profile_OBJ_ANCIENT_JEWELS = .data:0x00000000; // type:object size:0x10 data:4 lbl_509_data_10 = .data:0x00000010; // type:object size:0x30 lbl_509_data_40 = .data:0x00000040; // type:object size:0x4 data:string lbl_509_data_44 = .data:0x00000044; // type:object size:0x4C -lbl_509_data_90 = .data:0x00000090; // type:object size:0x80 +AcOAncientJewels__vtable = .data:0x00000090; // type:object size:0x80 lbl_509_data_110 = .data:0x00000110; // type:object size:0x30 lbl_509_data_140 = .data:0x00000140; // type:object size:0x30 lbl_509_data_170 = .data:0x00000170; // type:object size:0x18 @@ -103,7 +103,7 @@ lbl_509_data_1A0 = .data:0x000001A0; // type:object size:0x214 lbl_509_data_3B4 = .data:0x000003B4; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_509_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_509_bss_18 = .bss:0x00000018; // type:object size:0x80 data:4byte -lbl_509_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_509_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_509_bss_118 = .bss:0x00000118; // type:object size:0xB0 data:4byte +AcOAncientJewels__STATE_WAIT = .bss:0x00000018; // type:object size:0x80 data:4byte +AcOAncientJewels__STATE_DROP = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOAncientJewels__STATE_BURIED = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOAncientJewels__STATE_WHIP_CARRY = .bss:0x00000118; // type:object size:0xB0 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_appear_bridgeNP/symbols.txt b/config/SOUE01/rels/d_a_obj_appear_bridgeNP/symbols.txt index 6737701c..9c97177b 100644 --- a/config/SOUE01/rels/d_a_obj_appear_bridgeNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_appear_bridgeNP/symbols.txt @@ -68,7 +68,7 @@ __vt__31sFState_c<18dAcOappearBridge_c> = .data:0x00000168; // type:object size: __vt__Q34nw4r3g3d15IScnObjCallback = .data:0x00000180; // type:object size:0x20 __vt__33sFStateID_c<18dAcOappearBridge_c> = .data:0x0000027C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_407_bss_8 = .bss:0x00000008; // type:object size:0x18 scope:local data:4byte +AcOappearBridge__positionOffsetMaybe = .bss:0x00000008; // type:object size:0x18 scope:local data:4byte StateID_Wait__18dAcOappearBridge_c = .bss:0x00000020; // type:object size:0x30 data:4byte StateID_Appear__18dAcOappearBridge_c = .bss:0x00000060; // type:object size:0x30 data:4byte StateID_Disappear__18dAcOappearBridge_c = .bss:0x000000A0; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_ballistaNP/symbols.txt b/config/SOUE01/rels/d_a_obj_ballistaNP/symbols.txt index 611a07f3..e8b89e5d 100644 --- a/config/SOUE01/rels/d_a_obj_ballistaNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_ballistaNP/symbols.txt @@ -150,7 +150,7 @@ lbl_296_data_118 = .data:0x00000118; // type:object size:0x8 lbl_296_data_120 = .data:0x00000120; // type:object size:0x4 data:float lbl_296_data_124 = .data:0x00000124; // type:object size:0xC lbl_296_data_130 = .data:0x00000130; // type:object size:0x20 -lbl_296_data_150 = .data:0x00000150; // type:object size:0x80 +AcOBallista__vtable = .data:0x00000150; // type:object size:0x80 lbl_296_data_1D0 = .data:0x000001D0; // type:object size:0x30 lbl_296_data_200 = .data:0x00000200; // type:object size:0x30 lbl_296_data_230 = .data:0x00000230; // type:object size:0x18 @@ -160,12 +160,12 @@ lbl_296_data_278 = .data:0x00000278; // type:object size:0x23C lbl_296_data_4B4 = .data:0x000004B4; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_296_bss_8 = .bss:0x00000008; // type:object size:0x10 data:float -lbl_296_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_296_bss_58 = .bss:0x00000058; // type:object size:0x80 data:4byte -lbl_296_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_296_bss_118 = .bss:0x00000118; // type:object size:0x80 data:4byte -lbl_296_bss_198 = .bss:0x00000198; // type:object size:0x40 data:4byte -lbl_296_bss_1D8 = .bss:0x000001D8; // type:object size:0x54 data:4byte +AcOBallista__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOBallista__STATE_GRAB = .bss:0x00000058; // type:object size:0x80 data:4byte +AcOBallista__STATE_SHOT_END = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOBallista__STATE_CANCEL = .bss:0x00000118; // type:object size:0x80 data:4byte +AcOBallista__STATE_DEMO_SHOT_2 = .bss:0x00000198; // type:object size:0x40 data:4byte +AcOBallista__STATE_DEMO_SHOT_3 = .bss:0x000001D8; // type:object size:0x54 data:4byte lbl_296_bss_22C = .bss:0x0000022C; // type:object size:0x1 lbl_296_bss_22D = .bss:0x0000022D; // type:object size:0x1 data:byte lbl_296_bss_230 = .bss:0x00000230; // type:object size:0x10 data:float diff --git a/config/SOUE01/rels/d_a_obj_ballista_f3NP/symbols.txt b/config/SOUE01/rels/d_a_obj_ballista_f3NP/symbols.txt index c642ddbb..584fda4b 100644 --- a/config/SOUE01/rels/d_a_obj_ballista_f3NP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_ballista_f3NP/symbols.txt @@ -89,7 +89,7 @@ lbl_298_data_48 = .data:0x00000048; // type:object size:0x30 lbl_298_data_78 = .data:0x00000078; // type:object size:0x20 lbl_298_data_98 = .data:0x00000098; // type:object size:0x10 data:string lbl_298_data_A8 = .data:0x000000A8; // type:object size:0x8 data:float -lbl_298_data_B0 = .data:0x000000B0; // type:object size:0x80 +AcOBallistaF3__vtable = .data:0x000000B0; // type:object size:0x80 lbl_298_data_130 = .data:0x00000130; // type:object size:0x30 lbl_298_data_160 = .data:0x00000160; // type:object size:0x30 lbl_298_data_190 = .data:0x00000190; // type:object size:0x18 @@ -98,10 +98,10 @@ lbl_298_data_1C0 = .data:0x000001C0; // type:object size:0x1BC lbl_298_data_37C = .data:0x0000037C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_298_bss_8 = .bss:0x00000008; // type:object size:0x10 data:float -lbl_298_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_298_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_298_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_298_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_298_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_298_bss_158 = .bss:0x00000158; // type:object size:0x30 data:4byte +AcOBallistaF3__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOBallistaF3__STATE_SHOT = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOBallistaF3__STATE_SHOT_2 = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOBallistaF3__STATE_SHOT_END = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOBallistaF3__STATE_FALL_STONE = .bss:0x00000118; // type:object size:0x40 data:4byte +AcOBallistaF3__STATE_END_DEMO = .bss:0x00000158; // type:object size:0x30 data:4byte lbl_298_bss_188 = .bss:0x00000188; // type:object size:0xC data:float diff --git a/config/SOUE01/rels/d_a_obj_bambooNP/symbols.txt b/config/SOUE01/rels/d_a_obj_bambooNP/symbols.txt index 74c3bfec..ccedbec4 100644 --- a/config/SOUE01/rels/d_a_obj_bambooNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_bambooNP/symbols.txt @@ -123,7 +123,7 @@ lbl_108_data_244 = .data:0x00000244; // type:object size:0x10 lbl_108_data_254 = .data:0x00000254; // type:object size:0x8 lbl_108_data_25C = .data:0x0000025C; // type:object size:0x4 data:float lbl_108_data_260 = .data:0x00000260; // type:object size:0x10 -lbl_108_data_270 = .data:0x00000270; // type:object size:0x80 +AcOBamboo__vtable = .data:0x00000270; // type:object size:0x80 lbl_108_data_2F0 = .data:0x000002F0; // type:object size:0x30 lbl_108_data_320 = .data:0x00000320; // type:object size:0x30 lbl_108_data_350 = .data:0x00000350; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_obj_bamboo_islandNP/symbols.txt b/config/SOUE01/rels/d_a_obj_bamboo_islandNP/symbols.txt index 51fdc0a3..36404fb2 100644 --- a/config/SOUE01/rels/d_a_obj_bamboo_islandNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_bamboo_islandNP/symbols.txt @@ -11,8 +11,8 @@ draw__18dAcObambooIsland_cFv = .text:0x000003C0; // type:function size:0x60 __dt__18dAcObambooIsland_cFv = .text:0x00000420; // type:function size:0x80 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -lbl_404_rodata_0 = .rodata:0x00000000; // type:object size:0x8 scope:local data:float -lbl_404_rodata_8 = .rodata:0x00000008; // type:object size:0x20 scope:local data:4byte +dAcObambooIsland_c__unusedFloat1 = .rodata:0x00000000; // type:object size:0x8 scope:local data:float +sBambooIslandNames = .rodata:0x00000008; // type:object size:0x20 scope:local data:4byte lbl_404_data_0 = .data:0x00000000; // type:object size:0x8 scope:local data:string lbl_404_data_8 = .data:0x00000008; // type:object size:0x10 scope:local g_profile_OBJ_BAMBOO_ISLAND = .data:0x00000018; // type:object size:0x10 diff --git a/config/SOUE01/rels/d_a_obj_bb_bridgeNP/symbols.txt b/config/SOUE01/rels/d_a_obj_bb_bridgeNP/symbols.txt index a538d355..924ce6e1 100644 --- a/config/SOUE01/rels/d_a_obj_bb_bridgeNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_bb_bridgeNP/symbols.txt @@ -68,7 +68,7 @@ lbl_500_data_3C = .data:0x0000003C; // type:object size:0xC data:string lbl_500_data_48 = .data:0x00000048; // type:object size:0x58 lbl_500_data_A0 = .data:0x000000A0; // type:object size:0x1C data:string lbl_500_data_BC = .data:0x000000BC; // type:object size:0x4 data:4byte -lbl_500_data_C0 = .data:0x000000C0; // type:object size:0x80 +AcObbBridge__vtable = .data:0x000000C0; // type:object size:0x80 lbl_500_data_140 = .data:0x00000140; // type:object size:0x30 lbl_500_data_170 = .data:0x00000170; // type:object size:0x30 lbl_500_data_1A0 = .data:0x000001A0; // type:object size:0x18 @@ -77,5 +77,5 @@ lbl_500_data_1D0 = .data:0x000001D0; // type:object size:0x128 lbl_500_data_2F8 = .data:0x000002F8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_500_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_500_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_500_bss_58 = .bss:0x00000058; // type:object size:0x70 data:4byte +AcObbBridge__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcObbBridge__STATE_BROKEN_DEMO = .bss:0x00000058; // type:object size:0x70 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_bb_broken_partsNP/symbols.txt b/config/SOUE01/rels/d_a_obj_bb_broken_partsNP/symbols.txt index 71247d09..7452ef61 100644 --- a/config/SOUE01/rels/d_a_obj_bb_broken_partsNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_bb_broken_partsNP/symbols.txt @@ -44,7 +44,7 @@ isSameName__34sFStateID_c<19dAcObbBrokenParts_c>CFPCc = .text:0x00000E00; // typ _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global -lbl_430_rodata_0 = .rodata:0x00000000; // type:object size:0x30 data:float +AcObbBrokenParts__MODELS = .rodata:0x00000000; // type:object size:0x30 data:float lbl_430_data_0 = .data:0x00000000; // type:object size:0x14 data:4byte lbl_430_data_14 = .data:0x00000014; // type:object size:0x14 lbl_430_data_28 = .data:0x00000028; // type:object size:0x1C @@ -54,7 +54,7 @@ lbl_430_data_7C = .data:0x0000007C; // type:object size:0x1C g_profile_OBJ_BB_BROKEN_PARTS = .data:0x00000098; // type:object size:0x10 lbl_430_data_A8 = .data:0x000000A8; // type:object size:0x10 data:string lbl_430_data_B8 = .data:0x000000B8; // type:object size:0x28 -lbl_430_data_E0 = .data:0x000000E0; // type:object size:0x80 +AcObbBrokenParts__vtable = .data:0x000000E0; // type:object size:0x80 lbl_430_data_160 = .data:0x00000160; // type:object size:0x30 lbl_430_data_190 = .data:0x00000190; // type:object size:0x30 lbl_430_data_1C0 = .data:0x000001C0; // type:object size:0x18 @@ -62,5 +62,5 @@ lbl_430_data_1D8 = .data:0x000001D8; // type:object size:0xA8 lbl_430_data_280 = .data:0x00000280; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_430_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_430_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_430_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcObbBrokenParts__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcObbBrokenParts__STATE_BREAK = .bss:0x00000058; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_bb_objectsNP/symbols.txt b/config/SOUE01/rels/d_a_obj_bb_objectsNP/symbols.txt index 455b5a8e..5f3d5b8b 100644 --- a/config/SOUE01/rels/d_a_obj_bb_objectsNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_bb_objectsNP/symbols.txt @@ -41,7 +41,7 @@ isSameName__30sFStateID_c<15dAcObbObjects_c>CFPCc = .text:0x00000F20; // type:fu _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global -lbl_355_rodata_0 = .rodata:0x00000000; // type:object size:0x50 +AcObbObjects__BBObjectsOarcs = .rodata:0x00000000; // type:object size:0x50 lbl_355_data_0 = .data:0x00000000; // type:object size:0x10 data:4byte lbl_355_data_10 = .data:0x00000010; // type:object size:0x14 lbl_355_data_24 = .data:0x00000024; // type:object size:0x10 @@ -60,7 +60,7 @@ lbl_355_data_140 = .data:0x00000140; // type:object size:0x18 g_profile_OBJ_BB_OBJECTS = .data:0x00000158; // type:object size:0x68 lbl_355_data_1C0 = .data:0x000001C0; // type:object size:0x20 lbl_355_data_1E0 = .data:0x000001E0; // type:object size:0x8 data:string -lbl_355_data_1E8 = .data:0x000001E8; // type:object size:0x80 +AcObbObjects__vtable = .data:0x000001E8; // type:object size:0x80 lbl_355_data_268 = .data:0x00000268; // type:object size:0x30 lbl_355_data_298 = .data:0x00000298; // type:object size:0x30 lbl_355_data_2C8 = .data:0x000002C8; // type:object size:0x18 @@ -68,4 +68,4 @@ lbl_355_data_2E0 = .data:0x000002E0; // type:object size:0x5C lbl_355_data_33C = .data:0x0000033C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_355_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_355_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcObbObjects__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_bblargebombNP/symbols.txt b/config/SOUE01/rels/d_a_obj_bblargebombNP/symbols.txt index 097a97ce..5420696b 100644 --- a/config/SOUE01/rels/d_a_obj_bblargebombNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_bblargebombNP/symbols.txt @@ -89,7 +89,7 @@ lbl_128_data_10 = .data:0x00000010; // type:object size:0x2C lbl_128_data_3C = .data:0x0000003C; // type:object size:0x10 lbl_128_data_4C = .data:0x0000004C; // type:object size:0x20 lbl_128_data_6C = .data:0x0000006C; // type:object size:0x4 data:4byte -lbl_128_data_70 = .data:0x00000070; // type:object size:0x80 +AcOBblargebomb__vtable = .data:0x00000070; // type:object size:0x80 lbl_128_data_F0 = .data:0x000000F0; // type:object size:0x30 lbl_128_data_120 = .data:0x00000120; // type:object size:0x30 lbl_128_data_150 = .data:0x00000150; // type:object size:0x18 @@ -98,8 +98,8 @@ lbl_128_data_180 = .data:0x00000180; // type:object size:0x1C4 lbl_128_data_344 = .data:0x00000344; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_128_bss_8 = .bss:0x00000008; // type:object size:0x18 data:4byte -lbl_128_bss_20 = .bss:0x00000020; // type:object size:0x40 data:4byte -lbl_128_bss_60 = .bss:0x00000060; // type:object size:0x40 data:4byte -lbl_128_bss_A0 = .bss:0x000000A0; // type:object size:0x80 data:4byte -lbl_128_bss_120 = .bss:0x00000120; // type:object size:0x40 data:4byte -lbl_128_bss_160 = .bss:0x00000160; // type:object size:0x40 data:4byte +AcOBblargebomb__STATE_WAIT = .bss:0x00000020; // type:object size:0x40 data:4byte +AcOBblargebomb__STATE_EXPLODE = .bss:0x00000060; // type:object size:0x40 data:4byte +AcOBblargebomb__STATE_CARRY = .bss:0x000000A0; // type:object size:0x80 data:4byte +AcOBblargebomb__STATE_BIRTH = .bss:0x00000120; // type:object size:0x40 data:4byte +AcOBblargebomb__STATE_CONTROLED = .bss:0x00000160; // type:object size:0x40 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_bellNP/symbols.txt b/config/SOUE01/rels/d_a_obj_bellNP/symbols.txt index 69600b9b..c16ac563 100644 --- a/config/SOUE01/rels/d_a_obj_bellNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_bellNP/symbols.txt @@ -59,9 +59,9 @@ lbl_417_rodata_50 = .rodata:0x00000050; // type:object size:0x8 data:double lbl_417_rodata_58 = .rodata:0x00000058; // type:object size:0x4 data:float lbl_417_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 data:float g_profile_OBJ_BELL = .data:0x00000000; // type:object size:0x10 data:4byte -lbl_417_data_10 = .data:0x00000010; // type:object size:0x80 +AcObell__colliderInit = .data:0x00000010; // type:object size:0x80 lbl_417_data_90 = .data:0x00000090; // type:object size:0x18 data:string -lbl_417_data_A8 = .data:0x000000A8; // type:object size:0x80 +AcObell__vtable = .data:0x000000A8; // type:object size:0x80 lbl_417_data_128 = .data:0x00000128; // type:object size:0x30 lbl_417_data_158 = .data:0x00000158; // type:object size:0x30 lbl_417_data_188 = .data:0x00000188; // type:object size:0x18 @@ -69,6 +69,6 @@ lbl_417_data_1A0 = .data:0x000001A0; // type:object size:0xDC lbl_417_data_27C = .data:0x0000027C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_417_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_417_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_417_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_417_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +AcObell__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcObell__STATE_WAIT_RUPEE = .bss:0x00000058; // type:object size:0x40 data:4byte +AcObell__STATE_AFTER = .bss:0x00000098; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_belt_cvrNP/symbols.txt b/config/SOUE01/rels/d_a_obj_belt_cvrNP/symbols.txt index be055eac..e1f902f5 100644 --- a/config/SOUE01/rels/d_a_obj_belt_cvrNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_belt_cvrNP/symbols.txt @@ -82,7 +82,7 @@ lbl_267_data_60 = .data:0x00000060; // type:object size:0x14 lbl_267_data_74 = .data:0x00000074; // type:object size:0x90 lbl_267_data_104 = .data:0x00000104; // type:object size:0x1C lbl_267_data_120 = .data:0x00000120; // type:object size:0x8 -lbl_267_data_128 = .data:0x00000128; // type:object size:0x80 +AcObeltCvr__vtable = .data:0x00000128; // type:object size:0x80 lbl_267_data_1A8 = .data:0x000001A8; // type:object size:0x30 lbl_267_data_1D8 = .data:0x000001D8; // type:object size:0x30 lbl_267_data_208 = .data:0x00000208; // type:object size:0x18 @@ -90,4 +90,4 @@ lbl_267_data_220 = .data:0x00000220; // type:object size:0x58 lbl_267_data_278 = .data:0x00000278; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_267_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_267_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcObeltCvr__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_belt_obstacleNP/symbols.txt b/config/SOUE01/rels/d_a_obj_belt_obstacleNP/symbols.txt index 4aa855f3..8acb0411 100644 --- a/config/SOUE01/rels/d_a_obj_belt_obstacleNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_belt_obstacleNP/symbols.txt @@ -70,11 +70,11 @@ lbl_266_rodata_78 = .rodata:0x00000078; // type:object size:0x4 data:float lbl_266_rodata_7C = .rodata:0x0000007C; // type:object size:0x4 data:float lbl_266_rodata_80 = .rodata:0x00000080; // type:object size:0x4 data:float g_profile_OBJ_BELT_OBSTACLE = .data:0x00000000; // type:object size:0x10 data:4byte -lbl_266_data_10 = .data:0x00000010; // type:object size:0x30 +AcObeltObstacle__colliderInit = .data:0x00000010; // type:object size:0x30 lbl_266_data_40 = .data:0x00000040; // type:object size:0x10 lbl_266_data_50 = .data:0x00000050; // type:object size:0x20 data:string lbl_266_data_70 = .data:0x00000070; // type:object size:0x8 data:4byte -lbl_266_data_78 = .data:0x00000078; // type:object size:0x80 +AcObeltObstacle__vtable = .data:0x00000078; // type:object size:0x80 lbl_266_data_F8 = .data:0x000000F8; // type:object size:0x30 lbl_266_data_128 = .data:0x00000128; // type:object size:0x30 lbl_266_data_158 = .data:0x00000158; // type:object size:0x18 @@ -83,8 +83,8 @@ lbl_266_data_188 = .data:0x00000188; // type:object size:0x17C lbl_266_data_304 = .data:0x00000304; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_266_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_266_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_266_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_266_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_266_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_266_bss_118 = .bss:0x00000118; // type:object size:0x30 data:4byte +AcObeltObstacle__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcObeltObstacle__STATE_INIT = .bss:0x00000058; // type:object size:0x40 data:4byte +AcObeltObstacle__STATE_BELT_MOVE = .bss:0x00000098; // type:object size:0x40 data:4byte +AcObeltObstacle__STATE_TENI_N = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcObeltObstacle__STATE_TENI_N_ONLY = .bss:0x00000118; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_bgNP/symbols.txt b/config/SOUE01/rels/d_a_obj_bgNP/symbols.txt index 1b4f7870..c0bcdce5 100644 --- a/config/SOUE01/rels/d_a_obj_bgNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_bgNP/symbols.txt @@ -34,4 +34,4 @@ g_profile_OBJ_BG = .data:0x00000000; // type:object size:0x10 lbl_577_data_10 = .data:0x00000010; // type:object size:0xC0 lbl_577_data_D0 = .data:0x000000D0; // type:object size:0xC data:string lbl_577_data_DC = .data:0x000000DC; // type:object size:0x4 -lbl_577_data_E0 = .data:0x000000E0; // type:object size:0x80 +AcObg__vtable = .data:0x000000E0; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_bird_spNP/symbols.txt b/config/SOUE01/rels/d_a_obj_bird_spNP/symbols.txt index 6a517068..a33ec37a 100644 --- a/config/SOUE01/rels/d_a_obj_bird_spNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_bird_spNP/symbols.txt @@ -10,7 +10,7 @@ __dt__14dAcObjBirdSp_cFv = .text:0x000003F0; // type:function size:0x68 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global lbl_241_rodata_0 = .rodata:0x00000000; // type:object size:0x18 data:float -lbl_241_data_0 = .data:0x00000000; // type:object size:0x30 +AcObjBirdSp__colliderInit = .data:0x00000000; // type:object size:0x30 g_profile_OBJ_BIRD_SP_UP = .data:0x00000030; // type:object size:0x10 lbl_241_data_40 = .data:0x00000040; // type:object size:0x20 -lbl_241_data_60 = .data:0x00000060; // type:object size:0x80 +AcObjBirdSp__vtable = .data:0x00000060; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_blast_rockNP/symbols.txt b/config/SOUE01/rels/d_a_obj_blast_rockNP/symbols.txt index 5c7b9f35..451703a4 100644 --- a/config/SOUE01/rels/d_a_obj_blast_rockNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_blast_rockNP/symbols.txt @@ -196,7 +196,7 @@ lbl_281_data_81C = .data:0x0000081C; // type:object size:0x18 lbl_281_data_834 = .data:0x00000834; // type:object size:0x38 lbl_281_data_86C = .data:0x0000086C; // type:object size:0x4 data:4byte lbl_281_data_870 = .data:0x00000870; // type:object size:0x8 data:4byte -lbl_281_data_878 = .data:0x00000878; // type:object size:0x80 +AcOBlastRock__vtable = .data:0x00000878; // type:object size:0x80 lbl_281_data_8F8 = .data:0x000008F8; // type:object size:0x30 lbl_281_data_928 = .data:0x00000928; // type:object size:0x30 lbl_281_data_958 = .data:0x00000958; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_obj_block_ropeNP/symbols.txt b/config/SOUE01/rels/d_a_obj_block_ropeNP/symbols.txt index 0065d695..4dd5c2f0 100644 --- a/config/SOUE01/rels/d_a_obj_block_ropeNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_block_ropeNP/symbols.txt @@ -60,8 +60,8 @@ lbl_269_rodata_8 = .rodata:0x00000008; // type:object size:0x4 data:float lbl_269_rodata_C = .rodata:0x0000000C; // type:object size:0x30 data:float lbl_269_rodata_3C = .rodata:0x0000003C; // type:object size:0x4 data:float lbl_269_rodata_40 = .rodata:0x00000040; // type:object size:0x4 data:float -lbl_269_rodata_44 = .rodata:0x00000044; // type:object size:0x4 data:float -lbl_269_rodata_48 = .rodata:0x00000048; // type:object size:0x10 data:float +AcOblockRope__gravityAccel = .rodata:0x00000044; // type:object size:0x4 data:float +AcOblockRope__gravity = .rodata:0x00000048; // type:object size:0x10 data:float lbl_269_rodata_58 = .rodata:0x00000058; // type:object size:0x20 data:float lbl_269_rodata_78 = .rodata:0x00000078; // type:object size:0x74 data:float g_profile_OBJ_BLOCK_ROPE = .data:0x00000000; // type:object size:0x70 data:4byte @@ -69,13 +69,13 @@ lbl_269_data_70 = .data:0x00000070; // type:object size:0x10 data:string lbl_269_data_80 = .data:0x00000080; // type:object size:0x38 lbl_269_data_B8 = .data:0x000000B8; // type:object size:0x4 data:4byte lbl_269_data_BC = .data:0x000000BC; // type:object size:0x4 data:4byte -lbl_269_data_C0 = .data:0x000000C0; // type:object size:0x80 -lbl_269_data_140 = .data:0x00000140; // type:object size:0x30 +AcOblockRope__vtable = .data:0x000000C0; // type:object size:0x80 +AcOblockRope__stateMgr_vtable' = .data:0x00000140; // type:object size:0x30 lbl_269_data_170 = .data:0x00000170; // type:object size:0x30 lbl_269_data_1A0 = .data:0x000001A0; // type:object size:0x18 lbl_269_data_1B8 = .data:0x000001B8; // type:object size:0xA0 lbl_269_data_258 = .data:0x00000258; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_269_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_269_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_269_bss_58 = .bss:0x00000058; // type:object size:0x50 data:4byte +AcOblockRope__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOblockRope__STATE_DELETE = .bss:0x00000058; // type:object size:0x50 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_block_undergroundNP/symbols.txt b/config/SOUE01/rels/d_a_obj_block_undergroundNP/symbols.txt index 7379ac3a..02afe193 100644 --- a/config/SOUE01/rels/d_a_obj_block_undergroundNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_block_undergroundNP/symbols.txt @@ -45,4 +45,4 @@ lbl_459_data_2C = .data:0x0000002C; // type:object size:0x10 lbl_459_data_3C = .data:0x0000003C; // type:object size:0x10 lbl_459_data_4C = .data:0x0000004C; // type:object size:0x10 lbl_459_data_5C = .data:0x0000005C; // type:object size:0x24 -lbl_459_data_80 = .data:0x00000080; // type:object size:0x80 +AcOBlockUnderground__vtable = .data:0x00000080; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_boatNP/symbols.txt b/config/SOUE01/rels/d_a_obj_boatNP/symbols.txt index 94c508dc..44388436 100644 --- a/config/SOUE01/rels/d_a_obj_boatNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_boatNP/symbols.txt @@ -84,7 +84,7 @@ lbl_294_data_D4 = .data:0x000000D4; // type:object size:0x4 data:4byte lbl_294_data_D8 = .data:0x000000D8; // type:object size:0x4 data:float lbl_294_data_DC = .data:0x000000DC; // type:object size:0x4 data:float lbl_294_data_E0 = .data:0x000000E0; // type:object size:0x8 data:float -lbl_294_data_E8 = .data:0x000000E8; // type:object size:0x80 +AcOBoat__vtable = .data:0x000000E8; // type:object size:0x80 lbl_294_data_168 = .data:0x00000168; // type:object size:0x30 lbl_294_data_198 = .data:0x00000198; // type:object size:0x30 lbl_294_data_1C8 = .data:0x000001C8; // type:object size:0x18 @@ -93,9 +93,9 @@ lbl_294_data_1F8 = .data:0x000001F8; // type:object size:0x1D8 lbl_294_data_3D0 = .data:0x000003D0; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_294_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_294_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_294_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_294_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_294_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_294_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_294_bss_158 = .bss:0x00000158; // type:object size:0x30 data:4byte +AcOBoat__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOBoat__STATE_FALL = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOBoat__STATE_FALL_END = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOBoat__STATE_FALL_STOP = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOBoat__STATE_UP = .bss:0x00000118; // type:object size:0x40 data:4byte +AcOBoat__STATE_UP_END = .bss:0x00000158; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_bridge_boneNP/symbols.txt b/config/SOUE01/rels/d_a_obj_bridge_boneNP/symbols.txt index 6f9ae8e0..336575dd 100644 --- a/config/SOUE01/rels/d_a_obj_bridge_boneNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_bridge_boneNP/symbols.txt @@ -53,7 +53,7 @@ g_profile_OBJ_BRIDGE_BONE = .data:0x00000000; // type:object size:0x10 data:4byt lbl_492_data_10 = .data:0x00000010; // type:object size:0x74 lbl_492_data_84 = .data:0x00000084; // type:object size:0x20 lbl_492_data_A4 = .data:0x000000A4; // type:object size:0x4 data:float -lbl_492_data_A8 = .data:0x000000A8; // type:object size:0x80 +AcOBridgeBone__vtable = .data:0x000000A8; // type:object size:0x80 lbl_492_data_128 = .data:0x00000128; // type:object size:0x30 lbl_492_data_158 = .data:0x00000158; // type:object size:0x30 lbl_492_data_188 = .data:0x00000188; // type:object size:0x18 @@ -61,4 +61,4 @@ lbl_492_data_1A0 = .data:0x000001A0; // type:object size:0x5C lbl_492_data_1FC = .data:0x000001FC; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_492_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_492_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcOBridgeBone__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_bridge_buildingNP/symbols.txt b/config/SOUE01/rels/d_a_obj_bridge_buildingNP/symbols.txt index 5526ad6e..2d86c360 100644 --- a/config/SOUE01/rels/d_a_obj_bridge_buildingNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_bridge_buildingNP/symbols.txt @@ -60,7 +60,7 @@ lbl_356_rodata_3C = .rodata:0x0000003C; // type:object size:0x4 data:float lbl_356_rodata_40 = .rodata:0x00000040; // type:object size:0x4 data:float g_profile_OBJ_BRIDGE_BUILDING = .data:0x00000000; // type:object size:0x50 data:4byte lbl_356_data_50 = .data:0x00000050; // type:object size:0x28 -lbl_356_data_78 = .data:0x00000078; // type:object size:0x80 +AcObridgeBuilding__vtable = .data:0x00000078; // type:object size:0x80 lbl_356_data_F8 = .data:0x000000F8; // type:object size:0x30 lbl_356_data_128 = .data:0x00000128; // type:object size:0x30 lbl_356_data_158 = .data:0x00000158; // type:object size:0x18 @@ -68,8 +68,8 @@ lbl_356_data_170 = .data:0x00000170; // type:object size:0x188 lbl_356_data_2F8 = .data:0x000002F8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_356_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_356_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_356_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_356_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_356_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_356_bss_118 = .bss:0x00000118; // type:object size:0x30 data:4byte +AcObridgeBuilding__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcObridgeBuilding__STATE_PRE_MOVE = .bss:0x00000058; // type:object size:0x40 data:4byte +AcObridgeBuilding__STATE_MOVE = .bss:0x00000098; // type:object size:0x40 data:4byte +AcObridgeBuilding__STATE_SHAKE = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcObridgeBuilding__STATE_ACROSS = .bss:0x00000118; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_bridge_fallNP/symbols.txt b/config/SOUE01/rels/d_a_obj_bridge_fallNP/symbols.txt index 2c7ec4d7..1cf2c41f 100644 --- a/config/SOUE01/rels/d_a_obj_bridge_fallNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_bridge_fallNP/symbols.txt @@ -69,7 +69,7 @@ lbl_283_data_10 = .data:0x00000010; // type:object size:0x88 lbl_283_data_98 = .data:0x00000098; // type:object size:0x20 lbl_283_data_B8 = .data:0x000000B8; // type:object size:0x4 data:4byte lbl_283_data_BC = .data:0x000000BC; // type:object size:0x4 data:float -lbl_283_data_C0 = .data:0x000000C0; // type:object size:0x80 +AcOBridgeFall__vtable = .data:0x000000C0; // type:object size:0x80 lbl_283_data_140 = .data:0x00000140; // type:object size:0x30 lbl_283_data_170 = .data:0x00000170; // type:object size:0x30 lbl_283_data_1A0 = .data:0x000001A0; // type:object size:0x18 @@ -78,8 +78,8 @@ lbl_283_data_1D0 = .data:0x000001D0; // type:object size:0x128 lbl_283_data_2F8 = .data:0x000002F8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_283_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_283_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_283_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_283_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +AcOBridgeFall__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOBridgeFall__STATE_FALL = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOBridgeFall__STATE_SHAKE = .bss:0x00000098; // type:object size:0x30 data:4byte lbl_283_bss_C8 = .bss:0x000000C8; // type:object size:0x1 data:byte lbl_283_bss_CC = .bss:0x000000CC; // type:object size:0xC data:float diff --git a/config/SOUE01/rels/d_a_obj_bridge_stepNP/symbols.txt b/config/SOUE01/rels/d_a_obj_bridge_stepNP/symbols.txt index e95bf053..d063dc9d 100644 --- a/config/SOUE01/rels/d_a_obj_bridge_stepNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_bridge_stepNP/symbols.txt @@ -82,7 +82,7 @@ lbl_284_data_154 = .data:0x00000154; // type:object size:0x4 lbl_284_data_158 = .data:0x00000158; // type:object size:0x4 data:float lbl_284_data_15C = .data:0x0000015C; // type:object size:0x4 lbl_284_data_160 = .data:0x00000160; // type:object size:0x8 -lbl_284_data_168 = .data:0x00000168; // type:object size:0x80 +AcOBridgeStep__vtable = .data:0x00000168; // type:object size:0x80 lbl_284_data_1E8 = .data:0x000001E8; // type:object size:0x30 lbl_284_data_218 = .data:0x00000218; // type:object size:0x30 lbl_284_data_248 = .data:0x00000248; // type:object size:0x18 @@ -91,7 +91,7 @@ lbl_284_data_278 = .data:0x00000278; // type:object size:0x13C lbl_284_data_3B4 = .data:0x000003B4; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_284_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_284_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_284_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_284_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_284_bss_D8 = .bss:0x000000D8; // type:object size:0x30 data:4byte +AcOBridgeStep__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOBridgeStep__STATE_SWITCH_PUSHED = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOBridgeStep__STATE_BRIDGE_UP = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOBridgeStep__STATE_BRIDGE_UP_ALL = .bss:0x000000D8; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_bridge_stretchNP/symbols.txt b/config/SOUE01/rels/d_a_obj_bridge_stretchNP/symbols.txt index e590bfb3..d1a5c4f4 100644 --- a/config/SOUE01/rels/d_a_obj_bridge_stretchNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_bridge_stretchNP/symbols.txt @@ -61,7 +61,7 @@ lbl_360_data_10 = .data:0x00000010; // type:object size:0x3C lbl_360_data_4C = .data:0x0000004C; // type:object size:0x24 lbl_360_data_70 = .data:0x00000070; // type:object size:0x4 data:4byte lbl_360_data_74 = .data:0x00000074; // type:object size:0x4 data:4byte -lbl_360_data_78 = .data:0x00000078; // type:object size:0x80 +AcObridgeStretch__vtable = .data:0x00000078; // type:object size:0x80 lbl_360_data_F8 = .data:0x000000F8; // type:object size:0x30 lbl_360_data_128 = .data:0x00000128; // type:object size:0x30 lbl_360_data_158 = .data:0x00000158; // type:object size:0x18 @@ -71,6 +71,6 @@ lbl_360_data_2C4 = .data:0x000002C4; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_360_bss_8 = .bss:0x00000008; // type:object size:0x4 data:4byte lbl_360_bss_C = .bss:0x0000000C; // type:object size:0x54 data:2byte -lbl_360_bss_60 = .bss:0x00000060; // type:object size:0x40 data:4byte -lbl_360_bss_A0 = .bss:0x000000A0; // type:object size:0x40 data:4byte -lbl_360_bss_E0 = .bss:0x000000E0; // type:object size:0x30 data:4byte +AcObridgeStretch__STATE_MOVE = .bss:0x00000060; // type:object size:0x40 data:4byte +AcObridgeStretch__STATE_SHAKE = .bss:0x000000A0; // type:object size:0x40 data:4byte +AcObridgeStretch__STATE_STRETCH = .bss:0x000000E0; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_bridge_timeNP/symbols.txt b/config/SOUE01/rels/d_a_obj_bridge_timeNP/symbols.txt index ccbac7f5..8c04aa26 100644 --- a/config/SOUE01/rels/d_a_obj_bridge_timeNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_bridge_timeNP/symbols.txt @@ -59,10 +59,10 @@ g_profile_OBJ_BRIDGE_TIME = .data:0x00000000; // type:object size:0x10 data:4byt lbl_614_data_10 = .data:0x00000010; // type:object size:0xC data:string lbl_614_data_1C = .data:0x0000001C; // type:object size:0xC data:string lbl_614_data_28 = .data:0x00000028; // type:object size:0xC data:string -lbl_614_data_34 = .data:0x00000034; // type:object size:0xC +AcOBridgeTime__MODEL_NAMES = .data:0x00000034; // type:object size:0xC lbl_614_data_40 = .data:0x00000040; // type:object size:0x10 data:string lbl_614_data_50 = .data:0x00000050; // type:object size:0x20 -lbl_614_data_70 = .data:0x00000070; // type:object size:0x80 +AcOBridgeTime__vtable = .data:0x00000070; // type:object size:0x80 lbl_614_data_F0 = .data:0x000000F0; // type:object size:0x30 lbl_614_data_120 = .data:0x00000120; // type:object size:0x30 lbl_614_data_150 = .data:0x00000150; // type:object size:0x18 @@ -70,6 +70,6 @@ lbl_614_data_168 = .data:0x00000168; // type:object size:0xAC lbl_614_data_214 = .data:0x00000214; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_614_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_614_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte -lbl_614_bss_48 = .bss:0x00000048; // type:object size:0x6 data:2byte -lbl_614_bss_4E = .bss:0x0000004E; // type:object size:0x1 data:byte +AcOBridgeTime__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte +AcOBridgeTime__EFFECTS = .bss:0x00000048; // type:object size:0x6 data:2byte +AcOBridgeTime__initEffectNums = .bss:0x0000004E; // type:object size:0x1 data:byte diff --git a/config/SOUE01/rels/d_a_obj_bstoneNP/symbols.txt b/config/SOUE01/rels/d_a_obj_bstoneNP/symbols.txt index d40bb482..795fb972 100644 --- a/config/SOUE01/rels/d_a_obj_bstoneNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_bstoneNP/symbols.txt @@ -15,4 +15,4 @@ lbl_18_rodata_4 = .rodata:0x00000004; // type:object size:0x20 data:float lbl_18_rodata_24 = .rodata:0x00000024; // type:object size:0x4 data:float g_profile_OBJ_BSTONE = .data:0x00000000; // type:object size:0x40 lbl_18_data_40 = .data:0x00000040; // type:object size:0x20 -lbl_18_data_60 = .data:0x00000060; // type:object size:0x80 +AcObstonec__vtable = .data:0x00000060; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_bulb_switchNP/symbols.txt b/config/SOUE01/rels/d_a_obj_bulb_switchNP/symbols.txt index b4e8e0dc..f5fc06e7 100644 --- a/config/SOUE01/rels/d_a_obj_bulb_switchNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_bulb_switchNP/symbols.txt @@ -57,7 +57,7 @@ lbl_344_data_94 = .data:0x00000094; // type:object size:0x4 data:4byte lbl_344_data_98 = .data:0x00000098; // type:object size:0x4 data:4byte lbl_344_data_9C = .data:0x0000009C; // type:object size:0x4 data:4byte lbl_344_data_A0 = .data:0x000000A0; // type:object size:0x8 data:4byte -lbl_344_data_A8 = .data:0x000000A8; // type:object size:0x80 +AcObulbSwitch__vtable = .data:0x000000A8; // type:object size:0x80 lbl_344_data_128 = .data:0x00000128; // type:object size:0x30 lbl_344_data_158 = .data:0x00000158; // type:object size:0x30 lbl_344_data_188 = .data:0x00000188; // type:object size:0x18 @@ -65,6 +65,6 @@ lbl_344_data_1A0 = .data:0x000001A0; // type:object size:0xE8 lbl_344_data_288 = .data:0x00000288; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_344_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_344_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_344_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_344_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +AcObulbSwitch__STATE_CLOSE = .bss:0x00000018; // type:object size:0x40 data:4byte +AcObulbSwitch__STATE_OPEN = .bss:0x00000058; // type:object size:0x40 data:4byte +AcObulbSwitch__STATE_MOVE = .bss:0x00000098; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_cannonNP/symbols.txt b/config/SOUE01/rels/d_a_obj_cannonNP/symbols.txt index 5187f454..4c59a1a4 100644 --- a/config/SOUE01/rels/d_a_obj_cannonNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_cannonNP/symbols.txt @@ -67,7 +67,7 @@ lbl_357_rodata_34 = .rodata:0x00000034; // type:object size:0x4 data:float lbl_357_rodata_38 = .rodata:0x00000038; // type:object size:0x4 data:float g_profile_OBJ_CANNON = .data:0x00000000; // type:object size:0x50 data:4byte lbl_357_data_50 = .data:0x00000050; // type:object size:0x38 -lbl_357_data_88 = .data:0x00000088; // type:object size:0x80 +AcOcannon__vtable = .data:0x00000088; // type:object size:0x80 lbl_357_data_108 = .data:0x00000108; // type:object size:0x30 lbl_357_data_138 = .data:0x00000138; // type:object size:0x30 lbl_357_data_168 = .data:0x00000168; // type:object size:0x18 @@ -75,9 +75,9 @@ lbl_357_data_180 = .data:0x00000180; // type:object size:0x1A8 lbl_357_data_328 = .data:0x00000328; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_357_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_357_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_357_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_357_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_357_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_357_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_357_bss_158 = .bss:0x00000158; // type:object size:0x30 data:4byte +AcOcannon__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOcannon__STATE_PRE_CHARGE = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOcannon__STATE_MOVE = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOcannon__STATE_AFTER_CHARGE = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOcannon__STATE_SHOT = .bss:0x00000118; // type:object size:0x40 data:4byte +AcOcannon__STATE_AFTER = .bss:0x00000158; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_cannon_coverNP/symbols.txt b/config/SOUE01/rels/d_a_obj_cannon_coverNP/symbols.txt index a20fb44c..ef3bdd46 100644 --- a/config/SOUE01/rels/d_a_obj_cannon_coverNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_cannon_coverNP/symbols.txt @@ -68,16 +68,16 @@ g_profile_OBJ_CANNON_COVER = .data:0x00000000; // type:object size:0x44 data:4by lbl_367_data_44 = .data:0x00000044; // type:object size:0x20 lbl_367_data_64 = .data:0x00000064; // type:object size:0x4 data:4byte lbl_367_data_68 = .data:0x00000068; // type:object size:0x8 data:float -lbl_367_data_70 = .data:0x00000070; // type:object size:0x80 +AcOcannonCover__vtable = .data:0x00000070; // type:object size:0x80 lbl_367_data_F0 = .data:0x000000F0; // type:object size:0x30 lbl_367_data_120 = .data:0x00000120; // type:object size:0x30 lbl_367_data_150 = .data:0x00000150; // type:object size:0x18 lbl_367_data_168 = .data:0x00000168; // type:object size:0x178 lbl_367_data_2E0 = .data:0x000002E0; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_367_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_367_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_367_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_367_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_367_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_367_bss_118 = .bss:0x00000118; // type:object size:0x30 data:4byte +CANNON_COVER_FFI = .bss:0x00000008; // type:object size:0x10 data:4byte +AcOcannonCover__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOcannonCover__STATE_OPEN = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOcannonCover__STATE_SHAKE = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOcannonCover__STATE_CLOSE = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOcannonCover__STATE_PLAY = .bss:0x00000118; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_chairNP/symbols.txt b/config/SOUE01/rels/d_a_obj_chairNP/symbols.txt index 22921898..c1e11dfd 100644 --- a/config/SOUE01/rels/d_a_obj_chairNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_chairNP/symbols.txt @@ -57,8 +57,8 @@ lbl_484_data_38 = .data:0x00000038; // type:object size:0x8 lbl_484_data_40 = .data:0x00000040; // type:object size:0x8 lbl_484_data_48 = .data:0x00000048; // type:object size:0x8 lbl_484_data_50 = .data:0x00000050; // type:object size:0x8 -lbl_484_data_58 = .data:0x00000058; // type:object size:0x80 -lbl_484_data_D8 = .data:0x000000D8; // type:object size:0x80 +AcOChair__CHAR_TYPES = .data:0x00000058; // type:object size:0x80 +AcOChair__vtable = .data:0x000000D8; // type:object size:0x80 lbl_484_data_158 = .data:0x00000158; // type:object size:0x30 lbl_484_data_188 = .data:0x00000188; // type:object size:0x30 lbl_484_data_1B8 = .data:0x000001B8; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_obj_chandelierNP/symbols.txt b/config/SOUE01/rels/d_a_obj_chandelierNP/symbols.txt index e53f959a..14f655e7 100644 --- a/config/SOUE01/rels/d_a_obj_chandelierNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_chandelierNP/symbols.txt @@ -71,14 +71,14 @@ g_profile_OBJ_CHANDELIER = .data:0x00000000; // type:object size:0x10 data:4byte lbl_553_data_10 = .data:0x00000010; // type:object size:0xA0 lbl_553_data_B0 = .data:0x000000B0; // type:object size:0x20 lbl_553_data_D0 = .data:0x000000D0; // type:object size:0x8 data:4byte -lbl_553_data_D8 = .data:0x000000D8; // type:object size:0x80 +AcOChandelier__vtable = .data:0x000000D8; // type:object size:0x80 lbl_553_data_158 = .data:0x00000158; // type:object size:0x30 lbl_553_data_188 = .data:0x00000188; // type:object size:0x30 lbl_553_data_1B8 = .data:0x000001B8; // type:object size:0x18 lbl_553_data_1D0 = .data:0x000001D0; // type:object size:0xE4 lbl_553_data_2B4 = .data:0x000002B4; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_553_bss_8 = .bss:0x00000008; // type:object size:0x18 data:4byte -lbl_553_bss_20 = .bss:0x00000020; // type:object size:0x40 data:4byte -lbl_553_bss_60 = .bss:0x00000060; // type:object size:0x40 data:4byte -lbl_553_bss_A0 = .bss:0x000000A0; // type:object size:0x30 data:4byte +AcOChandelier__HEARTPIECE_LOCATION = .bss:0x00000008; // type:object size:0x18 data:4byte +AcOChandelier__STATE_WAIT = .bss:0x00000020; // type:object size:0x40 data:4byte +AcOChandelier__STATE_FALL = .bss:0x00000060; // type:object size:0x40 data:4byte +AcOChandelier__STATE_FALL_END = .bss:0x000000A0; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_chestNP/symbols.txt b/config/SOUE01/rels/d_a_obj_chestNP/symbols.txt index c6b60c7e..d77f841c 100644 --- a/config/SOUE01/rels/d_a_obj_chestNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_chestNP/symbols.txt @@ -86,20 +86,20 @@ lbl_326_data_10 = .data:0x00000010; // type:object size:0x10 lbl_326_data_20 = .data:0x00000020; // type:object size:0x4 data:4byte lbl_326_data_24 = .data:0x00000024; // type:object size:0xC lbl_326_data_30 = .data:0x00000030; // type:object size:0x8 data:4byte -lbl_326_data_38 = .data:0x00000038; // type:object size:0x30 data:float +AcOChest__OPEN_WARDROBE_INTERACTION = .data:0x00000038; // type:object size:0x30 data:float g_profile_OBJ_CHEST = .data:0x00000068; // type:object size:0x10 lbl_326_data_78 = .data:0x00000078; // type:object size:0x10 lbl_326_data_88 = .data:0x00000088; // type:object size:0x10 lbl_326_data_98 = .data:0x00000098; // type:object size:0x10 lbl_326_data_A8 = .data:0x000000A8; // type:object size:0x10 -lbl_326_data_B8 = .data:0x000000B8; // type:object size:0x10 +AcOChest__INSIDE_MODEL_NAMES = .data:0x000000B8; // type:object size:0x10 lbl_326_data_C8 = .data:0x000000C8; // type:object size:0xC data:string lbl_326_data_D4 = .data:0x000000D4; // type:object size:0x1C lbl_326_data_F0 = .data:0x000000F0; // type:object size:0x8 lbl_326_data_F8 = .data:0x000000F8; // type:object size:0x28 lbl_326_data_120 = .data:0x00000120; // type:object size:0xC lbl_326_data_12C = .data:0x0000012C; // type:object size:0xC -lbl_326_data_138 = .data:0x00000138; // type:object size:0x80 +AcOChest__vtable = .data:0x00000138; // type:object size:0x80 lbl_326_data_1B8 = .data:0x000001B8; // type:object size:0x30 lbl_326_data_1E8 = .data:0x000001E8; // type:object size:0x30 lbl_326_data_218 = .data:0x00000218; // type:object size:0x18 @@ -107,7 +107,7 @@ lbl_326_data_230 = .data:0x00000230; // type:object size:0x130 lbl_326_data_360 = .data:0x00000360; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_326_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_326_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_326_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_326_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_326_bss_D8 = .bss:0x000000D8; // type:object size:0x30 data:4byte +AcOChest__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOChest__STATE_OPEN_EVENT = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOChest__STATE_FAIL_EVENT = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOChest__STATE_ORDER_OPEN_EVENT_AFTER = .bss:0x000000D8; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_cityNP/symbols.txt b/config/SOUE01/rels/d_a_obj_cityNP/symbols.txt index d1e0a796..813797eb 100644 --- a/config/SOUE01/rels/d_a_obj_cityNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_cityNP/symbols.txt @@ -24,5 +24,5 @@ lbl_401_data_14 = .data:0x00000014; // type:object size:0x14 g_profile_OBJ_CITY = .data:0x00000028; // type:object size:0x10 lbl_401_data_38 = .data:0x00000038; // type:object size:0xA0 lbl_401_data_D8 = .data:0x000000D8; // type:object size:0x18 data:string -lbl_401_data_F0 = .data:0x000000F0; // type:object size:0x80 +AcOcity__vtable = .data:0x000000F0; // type:object size:0x80 lbl_401_data_170 = .data:0x00000170; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_obj_city_waterNP/symbols.txt b/config/SOUE01/rels/d_a_obj_city_waterNP/symbols.txt index 808cff68..18c4c030 100644 --- a/config/SOUE01/rels/d_a_obj_city_waterNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_city_waterNP/symbols.txt @@ -17,4 +17,4 @@ lbl_423_data_10 = .data:0x00000010; // type:object size:0x10 data:string lbl_423_data_20 = .data:0x00000020; // type:object size:0x10 data:string g_profile_OBJ_CITY_WATER = .data:0x00000030; // type:object size:0x50 lbl_423_data_80 = .data:0x00000080; // type:object size:0x20 -lbl_423_data_A0 = .data:0x000000A0; // type:object size:0x8C +AcOcityWater__vtable = .data:0x000000A0; // type:object size:0x8C diff --git a/config/SOUE01/rels/d_a_obj_claw_shot_tgNP/symbols.txt b/config/SOUE01/rels/d_a_obj_claw_shot_tgNP/symbols.txt index 5603a66f..099ff11c 100644 --- a/config/SOUE01/rels/d_a_obj_claw_shot_tgNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_claw_shot_tgNP/symbols.txt @@ -40,8 +40,8 @@ isSameName__31sFStateID_c<16dAcOclawShotTg_c>CFPCc = .text:0x00000E60; // type:f _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global -lbl_343_rodata_0 = .rodata:0x00000000; // type:object size:0x8 data:float -lbl_343_rodata_8 = .rodata:0x00000008; // type:object size:0x8 +AcOclawShotTg__dzbData = .rodata:0x00000000; // type:object size:0x8 data:float +AcOclawShotTg__plcData = .rodata:0x00000008; // type:object size:0x8 lbl_343_rodata_10 = .rodata:0x00000010; // type:object size:0x1C data:float lbl_343_data_0 = .data:0x00000000; // type:object size:0x14 data:4byte lbl_343_data_14 = .data:0x00000014; // type:object size:0x14 @@ -52,7 +52,7 @@ lbl_343_data_60 = .data:0x00000060; // type:object size:0xC lbl_343_data_6C = .data:0x0000006C; // type:object size:0xC lbl_343_data_78 = .data:0x00000078; // type:object size:0x20 lbl_343_data_98 = .data:0x00000098; // type:object size:0x10 -lbl_343_data_A8 = .data:0x000000A8; // type:object size:0x80 +AcOclawShotTg__vtable = .data:0x000000A8; // type:object size:0x80 lbl_343_data_128 = .data:0x00000128; // type:object size:0x30 lbl_343_data_158 = .data:0x00000158; // type:object size:0x30 lbl_343_data_188 = .data:0x00000188; // type:object size:0x18 @@ -60,4 +60,4 @@ lbl_343_data_1A0 = .data:0x000001A0; // type:object size:0x5C lbl_343_data_1FC = .data:0x000001FC; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_343_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_343_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcOclawShotTg__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_clefNP/symbols.txt b/config/SOUE01/rels/d_a_obj_clefNP/symbols.txt index c708b6e8..3e24fb31 100644 --- a/config/SOUE01/rels/d_a_obj_clefNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_clefNP/symbols.txt @@ -107,7 +107,7 @@ fn_548_4080 = .text:0x00004080; // type:function size:0x8 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global -lbl_548_rodata_0 = .rodata:0x00000000; // type:object size:0x78 data:float +TADTONE_TYPE = .rodata:0x00000000; // type:object size:0x78 data:float lbl_548_rodata_78 = .rodata:0x00000078; // type:object size:0x4 data:4byte lbl_548_rodata_7C = .rodata:0x0000007C; // type:object size:0x64 data:4byte lbl_548_rodata_E0 = .rodata:0x000000E0; // type:object size:0x2C data:float @@ -135,7 +135,7 @@ lbl_548_data_C4 = .data:0x000000C4; // type:object size:0xC data:4byte lbl_548_data_D0 = .data:0x000000D0; // type:object size:0xC data:4byte lbl_548_data_DC = .data:0x000000DC; // type:object size:0xC data:4byte lbl_548_data_E8 = .data:0x000000E8; // type:object size:0x10 data:4byte -lbl_548_data_F8 = .data:0x000000F8; // type:object size:0x80 +dAcOClef__vtable = .data:0x000000F8; // type:object size:0x80 lbl_548_data_178 = .data:0x00000178; // type:object size:0x70 lbl_548_data_1E8 = .data:0x000001E8; // type:object size:0x30 lbl_548_data_218 = .data:0x00000218; // type:object size:0x30 @@ -145,7 +145,7 @@ lbl_548_data_278 = .data:0x00000278; // type:object size:0x1E8 lbl_548_data_460 = .data:0x00000460; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_548_bss_8 = .bss:0x00000008; // type:object size:0x50 data:4byte -lbl_548_bss_58 = .bss:0x00000058; // type:object size:0x80 data:4byte -lbl_548_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_548_bss_118 = .bss:0x00000118; // type:object size:0x80 data:4byte -lbl_548_bss_198 = .bss:0x00000198; // type:object size:0x74 data:4byte +dAcOClef__STATE_WAIT = .bss:0x00000058; // type:object size:0x80 data:4byte +dAcOClef__STATE_MOVE_TOWARD_PATH = .bss:0x000000D8; // type:object size:0x40 data:4byte +dAcOClef__STATE_PATH_MOVE = .bss:0x00000118; // type:object size:0x80 data:4byte +dAcOClef__STATE_DIE = .bss:0x00000198; // type:object size:0x74 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_control_panelNP/symbols.txt b/config/SOUE01/rels/d_a_obj_control_panelNP/symbols.txt index 0c3dc358..d2046936 100644 --- a/config/SOUE01/rels/d_a_obj_control_panelNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_control_panelNP/symbols.txt @@ -94,7 +94,7 @@ lbl_598_rodata_78 = .rodata:0x00000078; // type:object size:0x4 data:float lbl_598_rodata_7C = .rodata:0x0000007C; // type:object size:0x1C data:float lbl_598_rodata_98 = .rodata:0x00000098; // type:object size:0x4 data:float lbl_598_rodata_A0 = .rodata:0x000000A0; // type:object size:0x44 -lbl_598_data_0 = .data:0x00000000; // type:object size:0x10 data:4byte +s_ControlPanel_80f19b70 = .data:0x00000000; // type:object size:0x10 data:4byte lbl_598_data_10 = .data:0x00000010; // type:object size:0x4 data:4byte lbl_598_data_14 = .data:0x00000014; // type:object size:0x1C lbl_598_data_30 = .data:0x00000030; // type:object size:0x18 @@ -126,7 +126,7 @@ lbl_598_data_1A4 = .data:0x000001A4; // type:object size:0xC lbl_598_data_1B0 = .data:0x000001B0; // type:object size:0xC lbl_598_data_1BC = .data:0x000001BC; // type:object size:0xC lbl_598_data_1C8 = .data:0x000001C8; // type:object size:0x48 -lbl_598_data_210 = .data:0x00000210; // type:object size:0x80 +AcOControlPanel__vtable = .data:0x00000210; // type:object size:0x80 lbl_598_data_290 = .data:0x00000290; // type:object size:0x30 lbl_598_data_2C0 = .data:0x000002C0; // type:object size:0x30 lbl_598_data_2F0 = .data:0x000002F0; // type:object size:0x18 @@ -135,6 +135,6 @@ lbl_598_data_320 = .data:0x00000320; // type:object size:0xE0 lbl_598_data_400 = .data:0x00000400; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_598_bss_8 = .bss:0x00000008; // type:object size:0x78 data:4byte -lbl_598_bss_80 = .bss:0x00000080; // type:object size:0x40 data:4byte -lbl_598_bss_C0 = .bss:0x000000C0; // type:object size:0x40 data:4byte -lbl_598_bss_100 = .bss:0x00000100; // type:object size:0x30 data:4byte +AcOControlPanel__StateID_Wait = .bss:0x00000080; // type:object size:0x40 data:4byte +AcOControlPanel__StateID_Control = .bss:0x000000C0; // type:object size:0x40 data:4byte +AcOControlPanel__StateID_EndEvent = .bss:0x00000100; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_daynightNP/symbols.txt b/config/SOUE01/rels/d_a_obj_daynightNP/symbols.txt index 2c881103..b20231f9 100644 --- a/config/SOUE01/rels/d_a_obj_daynightNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_daynightNP/symbols.txt @@ -48,7 +48,7 @@ lbl_305_rodata_10 = .rodata:0x00000010; // type:object size:0x40 lbl_305_rodata_50 = .rodata:0x00000050; // type:object size:0x30 g_profile_OBJ_DAYNIGHT = .data:0x00000000; // type:object size:0x10 data:4byte lbl_305_data_10 = .data:0x00000010; // type:object size:0x8 data:string -lbl_305_data_18 = .data:0x00000018; // type:object size:0x80 +AcODayNight__vtable = .data:0x00000018; // type:object size:0x80 lbl_305_data_98 = .data:0x00000098; // type:object size:0x30 lbl_305_data_C8 = .data:0x000000C8; // type:object size:0x30 lbl_305_data_F8 = .data:0x000000F8; // type:object size:0x18 @@ -56,4 +56,4 @@ lbl_305_data_110 = .data:0x00000110; // type:object size:0x5C lbl_305_data_16C = .data:0x0000016C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_305_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_305_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcODayNight__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_desertNP/symbols.txt b/config/SOUE01/rels/d_a_obj_desertNP/symbols.txt index 2bfcfbbc..f551e746 100644 --- a/config/SOUE01/rels/d_a_obj_desertNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_desertNP/symbols.txt @@ -60,5 +60,5 @@ lbl_308_data_110 = .data:0x00000110; // type:object size:0x14 lbl_308_data_124 = .data:0x00000124; // type:object size:0x14 lbl_308_data_138 = .data:0x00000138; // type:object size:0x30 lbl_308_data_168 = .data:0x00000168; // type:object size:0x18 data:string -lbl_308_data_180 = .data:0x00000180; // type:object size:0x80 +AcODesert__vtable = .data:0x00000180; // type:object size:0x80 lbl_308_data_200 = .data:0x00000200; // type:object size:0x40 diff --git a/config/SOUE01/rels/d_a_obj_desert_agoNP/symbols.txt b/config/SOUE01/rels/d_a_obj_desert_agoNP/symbols.txt index ed381b09..4c604ec7 100644 --- a/config/SOUE01/rels/d_a_obj_desert_agoNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_desert_agoNP/symbols.txt @@ -49,7 +49,7 @@ lbl_590_data_30 = .data:0x00000030; // type:object size:0x20 lbl_590_data_50 = .data:0x00000050; // type:object size:0x20 lbl_590_data_70 = .data:0x00000070; // type:object size:0x38 lbl_590_data_A8 = .data:0x000000A8; // type:object size:0x20 -lbl_590_data_C8 = .data:0x000000C8; // type:object size:0x80 +AcODesertAgo__vtable = .data:0x000000C8; // type:object size:0x80 lbl_590_data_148 = .data:0x00000148; // type:object size:0x30 lbl_590_data_178 = .data:0x00000178; // type:object size:0x30 lbl_590_data_1A8 = .data:0x000001A8; // type:object size:0x18 @@ -57,4 +57,4 @@ lbl_590_data_1C0 = .data:0x000001C0; // type:object size:0x5C lbl_590_data_21C = .data:0x0000021C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_590_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_590_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcODesertAgo__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_desert_debrisNP/symbols.txt b/config/SOUE01/rels/d_a_obj_desert_debrisNP/symbols.txt index eff9101a..d9382676 100644 --- a/config/SOUE01/rels/d_a_obj_desert_debrisNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_desert_debrisNP/symbols.txt @@ -14,4 +14,4 @@ _dtors = .dtors:0x00000000; // type:label scope:global lbl_428_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float g_profile_OBJ_DESERT_DEBRIS = .data:0x00000000; // type:object size:0x70 lbl_428_data_70 = .data:0x00000070; // type:object size:0x20 data:string -lbl_428_data_90 = .data:0x00000090; // type:object size:0x80 +AcOdesertDebris__vtable = .data:0x00000090; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_desert_meterNP/symbols.txt b/config/SOUE01/rels/d_a_obj_desert_meterNP/symbols.txt index 117dd54a..30b3746b 100644 --- a/config/SOUE01/rels/d_a_obj_desert_meterNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_desert_meterNP/symbols.txt @@ -52,7 +52,7 @@ lbl_603_rodata_24 = .rodata:0x00000024; // type:object size:0x4 data:float g_profile_OBJ_DESERT_METER = .data:0x00000000; // type:object size:0x30 data:4byte lbl_603_data_30 = .data:0x00000030; // type:object size:0x30 lbl_603_data_60 = .data:0x00000060; // type:object size:0x20 -lbl_603_data_80 = .data:0x00000080; // type:object size:0x80 +AcODesertMeter__vtable = .data:0x00000080; // type:object size:0x80 lbl_603_data_100 = .data:0x00000100; // type:object size:0x30 lbl_603_data_130 = .data:0x00000130; // type:object size:0x30 lbl_603_data_160 = .data:0x00000160; // type:object size:0x18 @@ -60,5 +60,5 @@ lbl_603_data_178 = .data:0x00000178; // type:object size:0xA4 lbl_603_data_21C = .data:0x0000021C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_603_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_603_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_603_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcODesertMeter__StateID_Wait = .bss:0x00000018; // type:object size:0x40 data:4byte +AcODesertMeter__StateID_OnSwitch = .bss:0x00000058; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_distant_shipNP/symbols.txt b/config/SOUE01/rels/d_a_obj_distant_shipNP/symbols.txt index 30052acf..c0d2bd86 100644 --- a/config/SOUE01/rels/d_a_obj_distant_shipNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_distant_shipNP/symbols.txt @@ -18,4 +18,4 @@ lbl_616_data_10 = .data:0x00000010; // type:object size:0x10 data:string lbl_616_data_20 = .data:0x00000020; // type:object size:0x20 lbl_616_data_40 = .data:0x00000040; // type:object size:0x10 lbl_616_data_50 = .data:0x00000050; // type:object size:0x18 -lbl_616_data_68 = .data:0x00000068; // type:object size:0x80 +AcOdistantShip__vtable = .data:0x00000068; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_doorNP/symbols.txt b/config/SOUE01/rels/d_a_obj_doorNP/symbols.txt index 6f906fb0..2ed146d5 100644 --- a/config/SOUE01/rels/d_a_obj_doorNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_doorNP/symbols.txt @@ -155,7 +155,7 @@ lbl_572_data_1E0 = .data:0x000001E0; // type:object size:0x10 lbl_572_data_1F0 = .data:0x000001F0; // type:object size:0x60 lbl_572_data_250 = .data:0x00000250; // type:object size:0x90 lbl_572_data_2E0 = .data:0x000002E0; // type:object size:0x8 -lbl_572_bss_8 = .bss:0x00000008; // type:object size:0x14 data:byte +CERTAIN_DOOR_SUBTYPES = .bss:0x00000008; // type:object size:0x14 data:byte lbl_572_bss_1C = .bss:0x0000001C; // type:object size:0xC data:float lbl_572_bss_28 = .bss:0x00000028; // type:object size:0x28 data:float -lbl_572_bss_50 = .bss:0x00000050; // type:object size:0x40 +STRING_F402 = .bss:0x00000050; // type:object size:0x40 diff --git a/config/SOUE01/rels/d_a_obj_door_bossNP/symbols.txt b/config/SOUE01/rels/d_a_obj_door_bossNP/symbols.txt index 12df82f1..ba3a6770 100644 --- a/config/SOUE01/rels/d_a_obj_door_bossNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_door_bossNP/symbols.txt @@ -280,14 +280,14 @@ lbl_270_rodata_28 = .rodata:0x00000028; // type:object size:0x4 data:4byte lbl_270_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 data:4byte lbl_270_rodata_30 = .rodata:0x00000030; // type:object size:0xE8 data:4byte lbl_270_rodata_118 = .rodata:0x00000118; // type:object size:0x18 data:4byte -lbl_270_rodata_130 = .rodata:0x00000130; // type:object size:0x30 +AcODoorBoss__DUNGEON_BEATEN_STORYFLAGS = .rodata:0x00000130; // type:object size:0x30 lbl_270_rodata_160 = .rodata:0x00000160; // type:object size:0x18 lbl_270_rodata_178 = .rodata:0x00000178; // type:object size:0x4 data:4byte lbl_270_rodata_17C = .rodata:0x0000017C; // type:object size:0x4 data:4byte lbl_270_rodata_180 = .rodata:0x00000180; // type:object size:0x4 data:4byte lbl_270_rodata_184 = .rodata:0x00000184; // type:object size:0x4 data:4byte -lbl_270_rodata_188 = .rodata:0x00000188; // type:object size:0x30 -lbl_270_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x30 +AcODoorBoss__BossDoorExamineInteraction = .rodata:0x00000188; // type:object size:0x30 +AcODoorBoss__BossDoorOpenInteraction = .rodata:0x000001B8; // type:object size:0x30 lbl_270_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x4 data:float lbl_270_rodata_1EC = .rodata:0x000001EC; // type:object size:0x4 data:float lbl_270_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x4 data:float @@ -406,25 +406,25 @@ lbl_270_data_500 = .data:0x00000500; // type:object size:0x4 data:4byte lbl_270_data_504 = .data:0x00000504; // type:object size:0x1C data:string lbl_270_data_520 = .data:0x00000520; // type:object size:0x34 lbl_270_data_554 = .data:0x00000554; // type:object size:0x10 -lbl_270_data_564 = .data:0x00000564; // type:object size:0x94 +AcODoorBoss__vtable = .data:0x00000564; // type:object size:0x94 lbl_270_data_5F8 = .data:0x000005F8; // type:object size:0x30 lbl_270_data_628 = .data:0x00000628; // type:object size:0x30 lbl_270_data_658 = .data:0x00000658; // type:object size:0x18 lbl_270_data_670 = .data:0x00000670; // type:object size:0x4A8 lbl_270_data_B18 = .data:0x00000B18; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_270_bss_8 = .bss:0x00000008; // type:object size:0x4 data:float +s_DoorBoss = .bss:0x00000008; // type:object size:0x4 data:float lbl_270_bss_C = .bss:0x0000000C; // type:object size:0xC data:float lbl_270_bss_18 = .bss:0x00000018; // type:object size:0xC data:float -lbl_270_bss_24 = .bss:0x00000024; // type:object size:0x4 data:4byte -lbl_270_bss_28 = .bss:0x00000028; // type:object size:0x8 data:4byte -lbl_270_bss_30 = .bss:0x00000030; // type:object size:0xC data:4byte -lbl_270_bss_3C = .bss:0x0000003C; // type:object size:0x134 data:2byte +s_DoorBoss2 = .bss:0x00000024; // type:object size:0x4 data:4byte +s_BossLockD101 = .bss:0x00000028; // type:object size:0x8 data:4byte +s_DoorBoss3 = .bss:0x00000030; // type:object size:0xC data:4byte +AcODoorBoss__INITIAL_INSERT_ANGLE = .bss:0x0000003C; // type:object size:0x134 data:2byte lbl_270_bss_170 = .bss:0x00000170; // type:object size:0xC data:float lbl_270_bss_17C = .bss:0x0000017C; // type:object size:0x8C data:float -lbl_270_bss_208 = .bss:0x00000208; // type:object size:0x200 data:4byte -lbl_270_bss_408 = .bss:0x00000408; // type:object size:0x140 data:4byte -lbl_270_bss_548 = .bss:0x00000548; // type:object size:0x30 data:4byte +AcODoorBoss__STATE_CORRECT_KEY = .bss:0x00000208; // type:object size:0x200 data:4byte +AcODoorBoss__STATE_OPEN_WAIT = .bss:0x00000408; // type:object size:0x140 data:4byte +AcODoorBoss__STATE_BEFORE_TIME_SHIFT = .bss:0x00000548; // type:object size:0x30 data:4byte lbl_270_bss_578 = .bss:0x00000578; // type:object size:0x4 data:float lbl_270_bss_57C = .bss:0x0000057C; // type:object size:0x1 data:byte lbl_270_bss_580 = .bss:0x00000580; // type:object size:0x4 data:float diff --git a/config/SOUE01/rels/d_a_obj_door_dungeonD200NP/symbols.txt b/config/SOUE01/rels/d_a_obj_door_dungeonD200NP/symbols.txt index d350e795..aa187936 100644 --- a/config/SOUE01/rels/d_a_obj_door_dungeonD200NP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_door_dungeonD200NP/symbols.txt @@ -45,8 +45,8 @@ lbl_501_rodata_0 = .rodata:0x00000000; // type:object size:0x8 data:float lbl_501_rodata_8 = .rodata:0x00000008; // type:object size:0x4 data:4byte lbl_501_rodata_C = .rodata:0x0000000C; // type:object size:0x4 data:4byte lbl_501_rodata_10 = .rodata:0x00000010; // type:object size:0x10 data:4byte -lbl_501_rodata_20 = .rodata:0x00000020; // type:object size:0x30 -lbl_501_rodata_50 = .rodata:0x00000050; // type:object size:0x44 +HasAllKeyPiecesInteraction = .rodata:0x00000020; // type:object size:0x30 +NotAllKeyPiecesInteraction = .rodata:0x00000050; // type:object size:0x44 lbl_501_rodata_94 = .rodata:0x00000094; // type:object size:0x24 data:float lbl_501_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 data:float lbl_501_rodata_BC = .rodata:0x000000BC; // type:object size:0x4 data:float @@ -62,7 +62,7 @@ lbl_501_data_60 = .data:0x00000060; // type:object size:0x14 lbl_501_data_74 = .data:0x00000074; // type:object size:0xC lbl_501_data_80 = .data:0x00000080; // type:object size:0xC data:string lbl_501_data_8C = .data:0x0000008C; // type:object size:0x2C -lbl_501_data_B8 = .data:0x000000B8; // type:object size:0x80 +AcObjDoorDungeonD200__vtable = .data:0x000000B8; // type:object size:0x80 lbl_501_bss_8 = .bss:0x00000008; // type:object size:0xC data:4byte lbl_501_bss_14 = .bss:0x00000014; // type:object size:0xC data:float lbl_501_bss_20 = .bss:0x00000020; // type:object size:0xC data:float diff --git a/config/SOUE01/rels/d_a_obj_door_dungeonNP/symbols.txt b/config/SOUE01/rels/d_a_obj_door_dungeonNP/symbols.txt index 9146ea21..a48260ba 100644 --- a/config/SOUE01/rels/d_a_obj_door_dungeonNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_door_dungeonNP/symbols.txt @@ -84,7 +84,7 @@ lbl_554_data_1C = .data:0x0000001C; // type:object size:0xC lbl_554_data_28 = .data:0x00000028; // type:object size:0xC lbl_554_data_34 = .data:0x00000034; // type:object size:0x10 lbl_554_data_44 = .data:0x00000044; // type:object size:0xC -lbl_554_data_50 = .data:0x00000050; // type:object size:0x40 data:4byte +DoorToDungeonish_ModelAndType = .data:0x00000050; // type:object size:0x40 data:4byte lbl_554_data_90 = .data:0x00000090; // type:object size:0xC lbl_554_data_9C = .data:0x0000009C; // type:object size:0xC lbl_554_data_A8 = .data:0x000000A8; // type:object size:0xC @@ -100,7 +100,7 @@ lbl_554_data_130 = .data:0x00000130; // type:object size:0x58 lbl_554_data_188 = .data:0x00000188; // type:object size:0x8 lbl_554_data_190 = .data:0x00000190; // type:object size:0x8 jumptable_554_data_198 = .data:0x00000198; // type:object size:0x20 scope:local -lbl_554_data_1B8 = .data:0x000001B8; // type:object size:0xA0 +AcObjDoorDungeon__vtable = .data:0x000001B8; // type:object size:0xA0 lbl_554_bss_8 = .bss:0x00000008; // type:object size:0xC data:4byte lbl_554_bss_14 = .bss:0x00000014; // type:object size:0xC data:float lbl_554_bss_20 = .bss:0x00000020; // type:object size:0xC data:float diff --git a/config/SOUE01/rels/d_a_obj_dormitory_gateNP/symbols.txt b/config/SOUE01/rels/d_a_obj_dormitory_gateNP/symbols.txt index 087ebd79..6d49e68a 100644 --- a/config/SOUE01/rels/d_a_obj_dormitory_gateNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_dormitory_gateNP/symbols.txt @@ -71,7 +71,7 @@ lbl_534_data_130 = .data:0x00000130; // type:object size:0x4C lbl_534_data_17C = .data:0x0000017C; // type:object size:0x24 lbl_534_data_1A0 = .data:0x000001A0; // type:object size:0x4 data:4byte lbl_534_data_1A4 = .data:0x000001A4; // type:object size:0x4 data:4byte -lbl_534_data_1A8 = .data:0x000001A8; // type:object size:0x80 +AcODormitoryGate__vtable = .data:0x000001A8; // type:object size:0x80 lbl_534_data_228 = .data:0x00000228; // type:object size:0x30 lbl_534_data_258 = .data:0x00000258; // type:object size:0x30 lbl_534_data_288 = .data:0x00000288; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_obj_down_lavaNP/symbols.txt b/config/SOUE01/rels/d_a_obj_down_lavaNP/symbols.txt index 79a261f5..451c5e1d 100644 --- a/config/SOUE01/rels/d_a_obj_down_lavaNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_down_lavaNP/symbols.txt @@ -69,7 +69,7 @@ lbl_406_data_88 = .data:0x00000088; // type:object size:0xC lbl_406_data_94 = .data:0x00000094; // type:object size:0x1C data:string lbl_406_data_B0 = .data:0x000000B0; // type:object size:0x4 data:4byte lbl_406_data_B4 = .data:0x000000B4; // type:object size:0x4 data:4byte -lbl_406_data_B8 = .data:0x000000B8; // type:object size:0x80 +AcOdownLava__vtable = .data:0x000000B8; // type:object size:0x80 lbl_406_data_138 = .data:0x00000138; // type:object size:0x30 lbl_406_data_168 = .data:0x00000168; // type:object size:0x30 lbl_406_data_198 = .data:0x00000198; // type:object size:0x18 @@ -77,5 +77,5 @@ lbl_406_data_1B0 = .data:0x000001B0; // type:object size:0x104 lbl_406_data_2B4 = .data:0x000002B4; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_406_bss_8 = .bss:0x00000008; // type:object size:0x80 data:4byte -lbl_406_bss_88 = .bss:0x00000088; // type:object size:0x40 data:4byte -lbl_406_bss_C8 = .bss:0x000000C8; // type:object size:0x30 data:4byte +AcOdownLava__STATE_MOVE = .bss:0x00000088; // type:object size:0x40 data:4byte +AcOdownLava__STATE_AFTER = .bss:0x000000C8; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_drumNP/symbols.txt b/config/SOUE01/rels/d_a_obj_drumNP/symbols.txt index b09385ea..b63b4f45 100644 --- a/config/SOUE01/rels/d_a_obj_drumNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_drumNP/symbols.txt @@ -96,7 +96,7 @@ lbl_265_rodata_E0 = .rodata:0x000000E0; // type:object size:0x2C data:float g_profile_OBJ_DRUM = .data:0x00000000; // type:object size:0x58 data:4byte lbl_265_data_58 = .data:0x00000058; // type:object size:0x18 data:string lbl_265_data_70 = .data:0x00000070; // type:object size:0x8 data:4byte -lbl_265_data_78 = .data:0x00000078; // type:object size:0x80 +AcOdrum__vtable = .data:0x00000078; // type:object size:0x80 lbl_265_data_F8 = .data:0x000000F8; // type:object size:0x30 lbl_265_data_128 = .data:0x00000128; // type:object size:0x30 lbl_265_data_158 = .data:0x00000158; // type:object size:0x18 @@ -105,10 +105,10 @@ lbl_265_data_188 = .data:0x00000188; // type:object size:0x1D0 lbl_265_data_358 = .data:0x00000358; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_265_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_265_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_265_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_265_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_265_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_265_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_265_bss_158 = .bss:0x00000158; // type:object size:0x40 data:4byte -lbl_265_bss_198 = .bss:0x00000198; // type:object size:0x50 data:4byte +AcOdrum__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOdrum__STATE_MOVE = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOdrum__STATE_MOVE_END = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOdrum__STATE_FALL = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOdrum__STATE_INIT = .bss:0x00000118; // type:object size:0x40 data:4byte +AcOdrum__STATE_BELT_MOVE = .bss:0x00000158; // type:object size:0x40 data:4byte +AcOdrum__STATE_TENI_N = .bss:0x00000198; // type:object size:0x50 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_dungeon_shipNP/symbols.txt b/config/SOUE01/rels/d_a_obj_dungeon_shipNP/symbols.txt index 349cf948..2780dbf1 100644 --- a/config/SOUE01/rels/d_a_obj_dungeon_shipNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_dungeon_shipNP/symbols.txt @@ -95,7 +95,7 @@ lbl_485_data_48 = .data:0x00000048; // type:object size:0x34 lbl_485_data_7C = .data:0x0000007C; // type:object size:0x4 data:4byte lbl_485_data_80 = .data:0x00000080; // type:object size:0x4 data:4byte lbl_485_data_84 = .data:0x00000084; // type:object size:0x4 data:4byte -lbl_485_data_88 = .data:0x00000088; // type:object size:0x80 +AcODungeonShip__vtable = .data:0x00000088; // type:object size:0x80 lbl_485_data_108 = .data:0x00000108; // type:object size:0x30 lbl_485_data_138 = .data:0x00000138; // type:object size:0x30 lbl_485_data_168 = .data:0x00000168; // type:object size:0x18 @@ -103,8 +103,8 @@ lbl_485_data_180 = .data:0x00000180; // type:object size:0x1D4 lbl_485_data_354 = .data:0x00000354; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_485_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_485_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_485_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_485_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_485_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_485_bss_118 = .bss:0x00000118; // type:object size:0x30 data:4byte +AcODungeonShip__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcODungeonShip__STATE_TRANSPARENCY = .bss:0x00000058; // type:object size:0x40 data:4byte +AcODungeonShip__STATE_APPEAR_EVENT = .bss:0x00000098; // type:object size:0x40 data:4byte +AcODungeonShip__STATE_APPEAR = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcODungeonShip__STATE_END = .bss:0x00000118; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_evil_fieldNP/symbols.txt b/config/SOUE01/rels/d_a_obj_evil_fieldNP/symbols.txt index 9109333c..c46ad5c4 100644 --- a/config/SOUE01/rels/d_a_obj_evil_fieldNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_evil_fieldNP/symbols.txt @@ -64,7 +64,7 @@ lbl_396_data_48 = .data:0x00000048; // type:object size:0x14 lbl_396_data_5C = .data:0x0000005C; // type:object size:0x1C g_profile_OBJ_EVIL_FIELD = .data:0x00000078; // type:object size:0x10 lbl_396_data_88 = .data:0x00000088; // type:object size:0x20 -lbl_396_data_A8 = .data:0x000000A8; // type:object size:0x80 +AcOevilField__vtable = .data:0x000000A8; // type:object size:0x80 lbl_396_data_128 = .data:0x00000128; // type:object size:0x30 lbl_396_data_158 = .data:0x00000158; // type:object size:0x30 lbl_396_data_188 = .data:0x00000188; // type:object size:0x18 @@ -72,6 +72,6 @@ lbl_396_data_1A0 = .data:0x000001A0; // type:object size:0x108 lbl_396_data_2A8 = .data:0x000002A8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_396_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_396_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_396_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_396_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +AcOevilField__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOevilField__STATE_UP_DOWN = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOevilField__STATE_STOP = .bss:0x00000098; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_farmlandNP/symbols.txt b/config/SOUE01/rels/d_a_obj_farmlandNP/symbols.txt index 280e3098..fb62d392 100644 --- a/config/SOUE01/rels/d_a_obj_farmlandNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_farmlandNP/symbols.txt @@ -59,7 +59,7 @@ lbl_584_data_50 = .data:0x00000050; // type:object size:0x10 lbl_584_data_60 = .data:0x00000060; // type:object size:0x34 lbl_584_data_94 = .data:0x00000094; // type:object size:0x10 lbl_584_data_A4 = .data:0x000000A4; // type:object size:0xC data:string -lbl_584_data_B0 = .data:0x000000B0; // type:object size:0x80 +AcOFarmLand__vtable = .data:0x000000B0; // type:object size:0x80 lbl_584_data_130 = .data:0x00000130; // type:object size:0x30 lbl_584_data_160 = .data:0x00000160; // type:object size:0x30 lbl_584_data_190 = .data:0x00000190; // type:object size:0x18 @@ -67,5 +67,5 @@ lbl_584_data_1A8 = .data:0x000001A8; // type:object size:0xA4 lbl_584_data_24C = .data:0x0000024C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_584_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_584_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_584_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcOFarmLand__StateID_Wait = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOFarmLand__StateID_DummyEvent = .bss:0x00000058; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_fence_boko2NP/symbols.txt b/config/SOUE01/rels/d_a_obj_fence_boko2NP/symbols.txt index 36d288b8..97926aa3 100644 --- a/config/SOUE01/rels/d_a_obj_fence_boko2NP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_fence_boko2NP/symbols.txt @@ -13,4 +13,4 @@ _dtors = .dtors:0x00000000; // type:label scope:global lbl_371_rodata_0 = .rodata:0x00000000; // type:object size:0x1C data:float g_profile_OBJ_FENCE_BOKO2 = .data:0x00000000; // type:object size:0x44 lbl_371_data_44 = .data:0x00000044; // type:object size:0x24 -lbl_371_data_68 = .data:0x00000068; // type:object size:0x80 +AcOfenceBoko2__vtable = .data:0x00000068; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_fence_bokoNP/symbols.txt b/config/SOUE01/rels/d_a_obj_fence_bokoNP/symbols.txt index 877af9de..9d1dd095 100644 --- a/config/SOUE01/rels/d_a_obj_fence_bokoNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_fence_bokoNP/symbols.txt @@ -14,4 +14,4 @@ lbl_370_rodata_0 = .rodata:0x00000000; // type:object size:0x1C data:float lbl_370_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 data:float g_profile_OBJ_FENCE_BOKO = .data:0x00000000; // type:object size:0x44 lbl_370_data_44 = .data:0x00000044; // type:object size:0x24 -lbl_370_data_68 = .data:0x00000068; // type:object size:0x80 +AcOfenceBoko__vtable = .data:0x00000068; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_fence_ironNP/symbols.txt b/config/SOUE01/rels/d_a_obj_fence_ironNP/symbols.txt index e0c6f402..6b7832a5 100644 --- a/config/SOUE01/rels/d_a_obj_fence_ironNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_fence_ironNP/symbols.txt @@ -86,7 +86,7 @@ lbl_352_data_E8 = .data:0x000000E8; // type:object size:0x4 data:4byte lbl_352_data_EC = .data:0x000000EC; // type:object size:0x4 data:4byte lbl_352_data_F0 = .data:0x000000F0; // type:object size:0x4 data:4byte lbl_352_data_F4 = .data:0x000000F4; // type:object size:0x4 data:4byte -lbl_352_data_F8 = .data:0x000000F8; // type:object size:0x80 +AcOfenceIron__vtable = .data:0x000000F8; // type:object size:0x80 lbl_352_data_178 = .data:0x00000178; // type:object size:0x30 lbl_352_data_1A8 = .data:0x000001A8; // type:object size:0x30 lbl_352_data_1D8 = .data:0x000001D8; // type:object size:0x18 @@ -94,11 +94,11 @@ lbl_352_data_1F0 = .data:0x000001F0; // type:object size:0x25C lbl_352_data_44C = .data:0x0000044C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_352_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_352_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_352_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_352_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_352_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_352_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_352_bss_158 = .bss:0x00000158; // type:object size:0x40 data:4byte -lbl_352_bss_198 = .bss:0x00000198; // type:object size:0x40 data:4byte -lbl_352_bss_1D8 = .bss:0x000001D8; // type:object size:0x30 data:4byte +AcOfenceIron__STATE_CLOSE = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOfenceIron__STATE_PRE_MOVE_UP = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOfenceIron__STATE_MOVE_UP = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOfenceIron__STATE_AFTER_MOVE_UP = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOfenceIron__STATE_OPEN = .bss:0x00000118; // type:object size:0x40 data:4byte +AcOfenceIron__STATE_PRE_MOVE_DOWN = .bss:0x00000158; // type:object size:0x40 data:4byte +AcOfenceIron__STATE_MOVE_DOWN = .bss:0x00000198; // type:object size:0x40 data:4byte +AcOfenceIron__STATE_AFTER_MOVE_DOWN = .bss:0x000001D8; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_fence_konsaiNP/symbols.txt b/config/SOUE01/rels/d_a_obj_fence_konsaiNP/symbols.txt index abff36dd..1534e4e7 100644 --- a/config/SOUE01/rels/d_a_obj_fence_konsaiNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_fence_konsaiNP/symbols.txt @@ -13,4 +13,4 @@ _dtors = .dtors:0x00000000; // type:label scope:global lbl_381_rodata_0 = .rodata:0x00000000; // type:object size:0x18 data:float g_profile_OBJ_FENCE_KONSAI = .data:0x00000000; // type:object size:0x44 lbl_381_data_44 = .data:0x00000044; // type:object size:0x24 -lbl_381_data_68 = .data:0x00000068; // type:object size:0x80 +AcOfenceKonsai__vtable = .data:0x00000068; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_fireNP/symbols.txt b/config/SOUE01/rels/d_a_obj_fireNP/symbols.txt index f9ba6c90..47e7a62a 100644 --- a/config/SOUE01/rels/d_a_obj_fireNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_fireNP/symbols.txt @@ -74,7 +74,7 @@ lbl_263_data_D0 = .data:0x000000D0; // type:object size:0x4 data:string lbl_263_data_D4 = .data:0x000000D4; // type:object size:0x4 data:4byte lbl_263_data_D8 = .data:0x000000D8; // type:object size:0x10 lbl_263_data_E8 = .data:0x000000E8; // type:object size:0x8 data:4byte -lbl_263_data_F0 = .data:0x000000F0; // type:object size:0x80 +AcOFire__vtable = .data:0x000000F0; // type:object size:0x80 lbl_263_data_170 = .data:0x00000170; // type:object size:0x30 lbl_263_data_1A0 = .data:0x000001A0; // type:object size:0x30 lbl_263_data_1D0 = .data:0x000001D0; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_obj_flying_clawshot_targetNP/symbols.txt b/config/SOUE01/rels/d_a_obj_flying_clawshot_targetNP/symbols.txt index 689d8b9c..2549a546 100644 --- a/config/SOUE01/rels/d_a_obj_flying_clawshot_targetNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_flying_clawshot_targetNP/symbols.txt @@ -12,7 +12,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global sColSrc__26dAcOFlyingClawshotTarget_c = .rodata:0x00000000; // type:object size:0x28 data:4byte lbl_615_rodata_28 = .rodata:0x00000028; // type:object size:0x28 scope:local data:4byte -lbl_615_rodata_50 = .rodata:0x00000050; // type:object size:0x4 scope:local data:float +FLOAT_80f3d18c = .rodata:0x00000050; // type:object size:0x4 scope:local data:float lbl_615_rodata_54 = .rodata:0x00000054; // type:object size:0x4 scope:local data:float lbl_615_rodata_58 = .rodata:0x00000058; // type:object size:0x10 scope:local data:float g_profile_OBJ_FLYING_CLAWSHOT_TARGET = .data:0x00000000; // type:object size:0x10 diff --git a/config/SOUE01/rels/d_a_obj_fortune_ringNP/symbols.txt b/config/SOUE01/rels/d_a_obj_fortune_ringNP/symbols.txt index 373f85f0..2405a74e 100644 --- a/config/SOUE01/rels/d_a_obj_fortune_ringNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_fortune_ringNP/symbols.txt @@ -78,7 +78,7 @@ g_profile_OBJ_FORTUNE_RING = .data:0x00000000; // type:object size:0x10 data:4by lbl_354_data_10 = .data:0x00000010; // type:object size:0xC lbl_354_data_1C = .data:0x0000001C; // type:object size:0x10 lbl_354_data_2C = .data:0x0000002C; // type:object size:0x24 -lbl_354_data_50 = .data:0x00000050; // type:object size:0x80 +AcOfortuneRing__vtable = .data:0x00000050; // type:object size:0x80 lbl_354_data_D0 = .data:0x000000D0; // type:object size:0x30 lbl_354_data_100 = .data:0x00000100; // type:object size:0x30 lbl_354_data_130 = .data:0x00000130; // type:object size:0x18 @@ -86,6 +86,6 @@ lbl_354_data_148 = .data:0x00000148; // type:object size:0x18 lbl_354_data_160 = .data:0x00000160; // type:object size:0x98 lbl_354_data_1F8 = .data:0x000001F8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_354_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_354_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_354_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcOfortuneRing__PTR = .bss:0x00000008; // type:object size:0x10 data:4byte +AcOfortuneRing__StateID_Wait = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOfortuneRing__StateID_Play = .bss:0x00000058; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_fruitBNP/symbols.txt b/config/SOUE01/rels/d_a_obj_fruitBNP/symbols.txt index fae4ec4a..458132b5 100644 --- a/config/SOUE01/rels/d_a_obj_fruitBNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_fruitBNP/symbols.txt @@ -59,9 +59,9 @@ lbl_582_rodata_38 = .rodata:0x00000038; // type:object size:0x4 data:float g_profile_OBJ_FRUIT_B = .data:0x00000000; // type:object size:0x40 data:4byte lbl_582_data_40 = .data:0x00000040; // type:object size:0x30 lbl_582_data_70 = .data:0x00000070; // type:object size:0x4 data:4byte -lbl_582_data_74 = .data:0x00000074; // type:object size:0x10 +s_GetFruitDummy_80f0449c = .data:0x00000074; // type:object size:0x10 lbl_582_data_84 = .data:0x00000084; // type:object size:0xC data:string -lbl_582_data_90 = .data:0x00000090; // type:object size:0x80 +AcOFruitB__vtable = .data:0x00000090; // type:object size:0x80 lbl_582_data_110 = .data:0x00000110; // type:object size:0x30 lbl_582_data_140 = .data:0x00000140; // type:object size:0x30 lbl_582_data_170 = .data:0x00000170; // type:object size:0x18 @@ -70,6 +70,6 @@ lbl_582_data_1A0 = .data:0x000001A0; // type:object size:0xD4 lbl_582_data_274 = .data:0x00000274; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_582_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_582_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_582_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_582_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +AcOFruitB__StateID_Stick = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOFruitB__StateID_Wait = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOFruitB__StateID_DummyEvent = .bss:0x00000098; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_fruit_guts_leafNP/symbols.txt b/config/SOUE01/rels/d_a_obj_fruit_guts_leafNP/symbols.txt index c112e77d..83218dea 100644 --- a/config/SOUE01/rels/d_a_obj_fruit_guts_leafNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_fruit_guts_leafNP/symbols.txt @@ -14,8 +14,8 @@ __dt__19dAcOFruitGutsLeaf_cFv = .text:0x00000450; // type:function size:0x68 __sinit_\d_a_obj_fruit_guts_leaf_cpp = .text:0x000004C0; // type:function size:0x44 scope:local _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -lbl_517_rodata_0 = .rodata:0x00000000; // type:object size:0x4 scope:local data:float -lbl_517_rodata_4 = .rodata:0x00000004; // type:object size:0x4 scope:local data:4byte +mdlFileName = .rodata:0x00000000; // type:object size:0x4 scope:local data:float +mdlName = .rodata:0x00000004; // type:object size:0x4 scope:local data:4byte lbl_517_rodata_8 = .rodata:0x00000008; // type:object size:0x4 scope:local data:float lbl_517_rodata_C = .rodata:0x0000000C; // type:object size:0x14 scope:local data:float g_profile_OBJ_FRUIT_GUTS_LEAF = .data:0x00000000; // type:object size:0x10 @@ -23,5 +23,5 @@ lbl_517_data_10 = .data:0x00000010; // type:object size:0x8 scope:local data:str lbl_517_data_18 = .data:0x00000018; // type:object size:0xC scope:local data:string lbl_517_data_24 = .data:0x00000024; // type:object size:0x24 scope:local __vt__19dAcOFruitGutsLeaf_c = .data:0x00000048; // type:object size:0x80 -lbl_517_bss_8 = .bss:0x00000008; // type:object size:0xC scope:local data:float -lbl_517_bss_14 = .bss:0x00000014; // type:object size:0xC scope:local data:float +bbMin = .bss:0x00000008; // type:object size:0xC scope:local data:float +bbMax = .bss:0x00000014; // type:object size:0xC scope:local data:float diff --git a/config/SOUE01/rels/d_a_obj_fruit_treeNP/symbols.txt b/config/SOUE01/rels/d_a_obj_fruit_treeNP/symbols.txt index 0c9a9b39..61b58512 100644 --- a/config/SOUE01/rels/d_a_obj_fruit_treeNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_fruit_treeNP/symbols.txt @@ -49,7 +49,7 @@ lbl_583_rodata_4 = .rodata:0x00000004; // type:object size:0x38 data:float lbl_583_rodata_3C = .rodata:0x0000003C; // type:object size:0x10 data:float g_profile_OBJ_FRUIT_TREE = .data:0x00000000; // type:object size:0x10 data:4byte lbl_583_data_10 = .data:0x00000010; // type:object size:0xF0 data:float -lbl_583_data_100 = .data:0x00000100; // type:object size:0x80 +AcOFruitTree__vtable = .data:0x00000100; // type:object size:0x80 lbl_583_data_180 = .data:0x00000180; // type:object size:0x30 lbl_583_data_1B0 = .data:0x000001B0; // type:object size:0x30 lbl_583_data_1E0 = .data:0x000001E0; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_obj_gearNP/symbols.txt b/config/SOUE01/rels/d_a_obj_gearNP/symbols.txt index 2094da80..3f324ca9 100644 --- a/config/SOUE01/rels/d_a_obj_gearNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_gearNP/symbols.txt @@ -90,7 +90,7 @@ lbl_285_data_70 = .data:0x00000070; // type:object size:0x8 lbl_285_data_78 = .data:0x00000078; // type:object size:0x8 lbl_285_data_80 = .data:0x00000080; // type:object size:0x28 lbl_285_data_A8 = .data:0x000000A8; // type:object size:0x10 -lbl_285_data_B8 = .data:0x000000B8; // type:object size:0x80 +AcOGear__vtable = .data:0x000000B8; // type:object size:0x80 lbl_285_data_138 = .data:0x00000138; // type:object size:0x70 lbl_285_data_1A8 = .data:0x000001A8; // type:object size:0x30 lbl_285_data_1D8 = .data:0x000001D8; // type:object size:0x30 @@ -100,7 +100,7 @@ lbl_285_data_238 = .data:0x00000238; // type:object size:0x11C lbl_285_data_354 = .data:0x00000354; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_285_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_285_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_285_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_285_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_285_bss_D8 = .bss:0x000000D8; // type:object size:0x30 data:4byte +AcOGear__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOGear__STATE_ROTATION = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOGear__STATE_DEBOOST = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOGear__STATE_STOP = .bss:0x000000D8; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_girahimu_floorNP/symbols.txt b/config/SOUE01/rels/d_a_obj_girahimu_floorNP/symbols.txt index c627039f..8d8f5d5f 100644 --- a/config/SOUE01/rels/d_a_obj_girahimu_floorNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_girahimu_floorNP/symbols.txt @@ -72,7 +72,7 @@ lbl_604_data_10 = .data:0x00000010; // type:object size:0x10 lbl_604_data_20 = .data:0x00000020; // type:object size:0x10 data:string lbl_604_data_30 = .data:0x00000030; // type:object size:0x40 lbl_604_data_70 = .data:0x00000070; // type:object size:0x28 -lbl_604_data_98 = .data:0x00000098; // type:object size:0x80 +AcOGirahimuFloor__vtable = .data:0x00000098; // type:object size:0x80 lbl_604_data_118 = .data:0x00000118; // type:object size:0x30 lbl_604_data_148 = .data:0x00000148; // type:object size:0x30 lbl_604_data_178 = .data:0x00000178; // type:object size:0x18 @@ -80,6 +80,6 @@ lbl_604_data_190 = .data:0x00000190; // type:object size:0x184 lbl_604_data_314 = .data:0x00000314; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_604_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_604_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_604_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_604_bss_98 = .bss:0x00000098; // type:object size:0xB0 data:4byte +AcOGirahimuFloor__StateID_Wait = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOGirahimuFloor__StateID_Return = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOGirahimuFloor__StateID_Generate = .bss:0x00000098; // type:object size:0xB0 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_girahimu_knifeNP/symbols.txt b/config/SOUE01/rels/d_a_obj_girahimu_knifeNP/symbols.txt index 631af0e8..3bf6ab0e 100644 --- a/config/SOUE01/rels/d_a_obj_girahimu_knifeNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_girahimu_knifeNP/symbols.txt @@ -116,7 +116,7 @@ lbl_239_data_60 = .data:0x00000060; // type:object size:0x24 lbl_239_data_84 = .data:0x00000084; // type:object size:0x4 data:4byte lbl_239_data_88 = .data:0x00000088; // type:object size:0xC data:4byte lbl_239_data_94 = .data:0x00000094; // type:object size:0xC data:4byte -lbl_239_data_A0 = .data:0x000000A0; // type:object size:0x90 +AcObjGirahimuKnife__vtable = .data:0x000000A0; // type:object size:0x90 lbl_239_data_130 = .data:0x00000130; // type:object size:0x30 lbl_239_data_160 = .data:0x00000160; // type:object size:0x30 lbl_239_data_190 = .data:0x00000190; // type:object size:0x18 @@ -128,10 +128,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa lbl_239_bss_8 = .bss:0x00000008; // type:object size:0x8 data:4byte lbl_239_bss_10 = .bss:0x00000010; // type:object size:0x2 data:2byte lbl_239_bss_12 = .bss:0x00000012; // type:object size:0xE data:2byte -lbl_239_bss_20 = .bss:0x00000020; // type:object size:0x80 data:4byte -lbl_239_bss_A0 = .bss:0x000000A0; // type:object size:0xC0 data:4byte -lbl_239_bss_160 = .bss:0x00000160; // type:object size:0x40 data:4byte -lbl_239_bss_1A0 = .bss:0x000001A0; // type:object size:0xC0 data:4byte -lbl_239_bss_260 = .bss:0x00000260; // type:object size:0x30 data:4byte +AcObjGirahimuKnife__STATE_WAIT = .bss:0x00000020; // type:object size:0x80 data:4byte +AcObjGirahimuKnife__STATE_SPIN_WAIT_PRE_ATTACK = .bss:0x000000A0; // type:object size:0xC0 data:4byte +AcObjGirahimuKnife__STATE_ATTACK = .bss:0x00000160; // type:object size:0x40 data:4byte +AcObjGirahimuKnife__STATE_ATTACK_END = .bss:0x000001A0; // type:object size:0xC0 data:4byte +AcObjGirahimuKnife__STATE_CIRCLE_WAIT = .bss:0x00000260; // type:object size:0x30 data:4byte lbl_239_bss_290 = .bss:0x00000290; // type:object size:0x8 data:byte lbl_239_bss_298 = .bss:0x00000298; // type:object size:0x10 data:float diff --git a/config/SOUE01/rels/d_a_obj_girahimu_sword_linkNP/symbols.txt b/config/SOUE01/rels/d_a_obj_girahimu_sword_linkNP/symbols.txt index 97660378..1066c38e 100644 --- a/config/SOUE01/rels/d_a_obj_girahimu_sword_linkNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_girahimu_sword_linkNP/symbols.txt @@ -88,7 +88,7 @@ lbl_238_data_40 = .data:0x00000040; // type:object size:0x4 data:4byte lbl_238_data_44 = .data:0x00000044; // type:object size:0xC data:4byte lbl_238_data_50 = .data:0x00000050; // type:object size:0x1C data:4byte lbl_238_data_6C = .data:0x0000006C; // type:object size:0x4 data:4byte -lbl_238_data_70 = .data:0x00000070; // type:object size:0x80 +AcObjGirahimuSwordLink__vtable = .data:0x00000070; // type:object size:0x80 lbl_238_data_F0 = .data:0x000000F0; // type:object size:0x30 lbl_238_data_120 = .data:0x00000120; // type:object size:0x30 lbl_238_data_150 = .data:0x00000150; // type:object size:0x18 @@ -100,10 +100,10 @@ lbl_238_data_20C = .data:0x0000020C; // type:object size:0x23C lbl_238_data_448 = .data:0x00000448; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_238_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_238_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_238_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_238_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_238_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_238_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_238_bss_158 = .bss:0x00000158; // type:object size:0x40 data:4byte -lbl_238_bss_198 = .bss:0x00000198; // type:object size:0x48 data:4byte +AcObjGirahimuSwordLink__STATE_HIDE = .bss:0x00000018; // type:object size:0x40 data:4byte +AcObjGirahimuSwordLink__STATE_EQUIP = .bss:0x00000058; // type:object size:0x40 data:4byte +AcObjGirahimuSwordLink__STATE_GET_SWORD = .bss:0x00000098; // type:object size:0x40 data:4byte +AcObjGirahimuSwordLink__STATE_THROW = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcObjGirahimuSwordLink__STATE_AT_THROW = .bss:0x00000118; // type:object size:0x40 data:4byte +AcObjGirahimuSwordLink__STATE_STICK = .bss:0x00000158; // type:object size:0x40 data:4byte +AcObjGirahimuSwordLink__STATE_REFLECT = .bss:0x00000198; // type:object size:0x48 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_goddess_cubeNP/symbols.txt b/config/SOUE01/rels/d_a_obj_goddess_cubeNP/symbols.txt index 07e3fe53..fd8f8199 100644 --- a/config/SOUE01/rels/d_a_obj_goddess_cubeNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_goddess_cubeNP/symbols.txt @@ -60,7 +60,7 @@ __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 sc lbl_543_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float lbl_543_rodata_4 = .rodata:0x00000004; // type:object size:0x24 data:float g_profile_OBJ_GODDESS_CUBE = .data:0x00000000; // type:object size:0xA8 data:4byte -lbl_543_data_A8 = .data:0x000000A8; // type:object size:0x80 +AcOGoddessCube__vtable = .data:0x000000A8; // type:object size:0x80 lbl_543_data_128 = .data:0x00000128; // type:object size:0x30 lbl_543_data_158 = .data:0x00000158; // type:object size:0x30 lbl_543_data_188 = .data:0x00000188; // type:object size:0x18 @@ -69,5 +69,5 @@ lbl_543_data_1B8 = .data:0x000001B8; // type:object size:0xB8 lbl_543_data_270 = .data:0x00000270; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_543_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_543_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_543_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcOGoddessCube__StateID_Wait = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOGoddessCube__StateID_Shot = .bss:0x00000058; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_goddess_statueNP/symbols.txt b/config/SOUE01/rels/d_a_obj_goddess_statueNP/symbols.txt index c97745bd..a32a3c6b 100644 --- a/config/SOUE01/rels/d_a_obj_goddess_statueNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_goddess_statueNP/symbols.txt @@ -47,12 +47,12 @@ lbl_512_rodata_4 = .rodata:0x00000004; // type:object size:0x4 data:float lbl_512_rodata_8 = .rodata:0x00000008; // type:object size:0x4 data:float g_profile_OBJ_GODDESS_STATUE = .data:0x00000000; // type:object size:0x80 data:4byte lbl_512_data_80 = .data:0x00000080; // type:object size:0x10 -lbl_512_data_90 = .data:0x00000090; // type:object size:0x90 +AcOGoddessStatue__vtable = .data:0x00000090; // type:object size:0x90 lbl_512_data_120 = .data:0x00000120; // type:object size:0x30 -lbl_512_data_150 = .data:0x00000150; // type:object size:0x30 +AcOGoddessStatue__stateMgrVtableIgnore = .data:0x00000150; // type:object size:0x30 lbl_512_data_180 = .data:0x00000180; // type:object size:0x18 lbl_512_data_198 = .data:0x00000198; // type:object size:0x60 lbl_512_data_1F8 = .data:0x000001F8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_512_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_512_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcOGoddessStatue__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_graveNP/symbols.txt b/config/SOUE01/rels/d_a_obj_graveNP/symbols.txt index f05c3e67..66d3a755 100644 --- a/config/SOUE01/rels/d_a_obj_graveNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_graveNP/symbols.txt @@ -56,7 +56,7 @@ lbl_580_rodata_30 = .rodata:0x00000030; // type:object size:0x4 data:float g_profile_OBJ_GRAVE = .data:0x00000000; // type:object size:0x10 data:4byte lbl_580_data_10 = .data:0x00000010; // type:object size:0x90 lbl_580_data_A0 = .data:0x000000A0; // type:object size:0x20 -lbl_580_data_C0 = .data:0x000000C0; // type:object size:0x80 +AcOGrave__vtable = .data:0x000000C0; // type:object size:0x80 lbl_580_data_140 = .data:0x00000140; // type:object size:0x30 lbl_580_data_170 = .data:0x00000170; // type:object size:0x30 lbl_580_data_1A0 = .data:0x000001A0; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_obj_ground_coverNP/symbols.txt b/config/SOUE01/rels/d_a_obj_ground_coverNP/symbols.txt index 925c16e9..67996d44 100644 --- a/config/SOUE01/rels/d_a_obj_ground_coverNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_ground_coverNP/symbols.txt @@ -84,7 +84,7 @@ lbl_408_data_5C = .data:0x0000005C; // type:object size:0x14 lbl_408_data_70 = .data:0x00000070; // type:object size:0x18 g_profile_OBJ_GROUND_COVER = .data:0x00000088; // type:object size:0x10 lbl_408_data_98 = .data:0x00000098; // type:object size:0x20 -lbl_408_data_B8 = .data:0x000000B8; // type:object size:0x80 +AcOGroundCover__vtable = .data:0x000000B8; // type:object size:0x80 lbl_408_data_138 = .data:0x00000138; // type:object size:0x30 lbl_408_data_168 = .data:0x00000168; // type:object size:0x30 lbl_408_data_198 = .data:0x00000198; // type:object size:0x18 @@ -92,10 +92,10 @@ lbl_408_data_1B0 = .data:0x000001B0; // type:object size:0x23C lbl_408_data_3EC = .data:0x000003EC; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_408_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_408_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOGroundCover__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte lbl_408_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_408_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_408_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_408_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte +AcOGroundCover__STATE_APPEAR_WAIT = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOGroundCover__STATE_APPEAR_OPEN = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOGroundCover__STATE_APPEAR_CLOSE = .bss:0x00000118; // type:object size:0x40 data:4byte lbl_408_bss_158 = .bss:0x00000158; // type:object size:0x40 data:4byte lbl_408_bss_198 = .bss:0x00000198; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_harp_hintNP/symbols.txt b/config/SOUE01/rels/d_a_obj_harp_hintNP/symbols.txt index f3be969b..3ef11b83 100644 --- a/config/SOUE01/rels/d_a_obj_harp_hintNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_harp_hintNP/symbols.txt @@ -144,7 +144,7 @@ lbl_608_data_88 = .data:0x00000088; // type:object size:0x68 lbl_608_data_F0 = .data:0x000000F0; // type:object size:0x14 lbl_608_data_104 = .data:0x00000104; // type:object size:0x14 lbl_608_data_118 = .data:0x00000118; // type:object size:0x4 data:4byte -lbl_608_data_11C = .data:0x0000011C; // type:object size:0xC data:string +s_DefaultTalk_80f347e8 = .data:0x0000011C; // type:object size:0xC data:string lbl_608_data_128 = .data:0x00000128; // type:object size:0x8 data:string lbl_608_data_130 = .data:0x00000130; // type:object size:0xC data:string lbl_608_data_13C = .data:0x0000013C; // type:object size:0x10 @@ -155,7 +155,7 @@ lbl_608_data_178 = .data:0x00000178; // type:object size:0x4 lbl_608_data_17C = .data:0x0000017C; // type:object size:0x4 lbl_608_data_180 = .data:0x00000180; // type:object size:0x8 data:string lbl_608_data_188 = .data:0x00000188; // type:object size:0x10 -lbl_608_data_198 = .data:0x00000198; // type:object size:0x80 +AcOHarpHint__vtable = .data:0x00000198; // type:object size:0x80 lbl_608_data_218 = .data:0x00000218; // type:object size:0x30 lbl_608_data_248 = .data:0x00000248; // type:object size:0x30 lbl_608_data_278 = .data:0x00000278; // type:object size:0x18 @@ -166,7 +166,7 @@ lbl_608_data_2CC = .data:0x000002CC; // type:object size:0x484 lbl_608_data_750 = .data:0x00000750; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_608_bss_8 = .bss:0x00000008; // type:object size:0x50 data:4byte -lbl_608_bss_58 = .bss:0x00000058; // type:object size:0x80 data:4byte -lbl_608_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_608_bss_118 = .bss:0x00000118; // type:object size:0xC0 data:4byte -lbl_608_bss_1D8 = .bss:0x000001D8; // type:object size:0x230 data:4byte +AcOHarpHint__STATE_ROTATE = .bss:0x00000058; // type:object size:0x80 data:4byte +AcOHarpHint__STATE_TALK_START = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOHarpHint__STATE_TALK = .bss:0x00000118; // type:object size:0xC0 data:4byte +AcOHarpHint__STATE_WHIP = .bss:0x000001D8; // type:object size:0x230 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_himoNP/symbols.txt b/config/SOUE01/rels/d_a_obj_himoNP/symbols.txt index 277c498c..485a411e 100644 --- a/config/SOUE01/rels/d_a_obj_himoNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_himoNP/symbols.txt @@ -45,7 +45,7 @@ isSameName__25sFStateID_c<10dAcOhimo_c>CFPCc = .text:0x000015B0; // type:functio _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global -lbl_158_rodata_0 = .rodata:0x00000000; // type:object size:0x2C data:float +AcOhimo__colliderInit = .rodata:0x00000000; // type:object size:0x2C data:float lbl_158_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 data:float lbl_158_rodata_30 = .rodata:0x00000030; // type:object size:0x4 data:float lbl_158_rodata_38 = .rodata:0x00000038; // type:object size:0x40 data:double @@ -53,7 +53,7 @@ g_profile_OBJ_HIMO = .data:0x00000000; // type:object size:0x10 data:4byte lbl_158_data_10 = .data:0x00000010; // type:object size:0x8 lbl_158_data_18 = .data:0x00000018; // type:object size:0x10 lbl_158_data_28 = .data:0x00000028; // type:object size:0x18 data:string -lbl_158_data_40 = .data:0x00000040; // type:object size:0x80 +AcOhimo__vtable = .data:0x00000040; // type:object size:0x80 lbl_158_data_C0 = .data:0x000000C0; // type:object size:0x30 lbl_158_data_F0 = .data:0x000000F0; // type:object size:0x30 lbl_158_data_120 = .data:0x00000120; // type:object size:0x18 @@ -61,6 +61,6 @@ lbl_158_data_138 = .data:0x00000138; // type:object size:0x58 lbl_158_data_190 = .data:0x00000190; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_158_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_158_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcOhimo__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte lbl_158_bss_48 = .bss:0x00000048; // type:object size:0x1 data:byte lbl_158_bss_4C = .bss:0x0000004C; // type:object size:0xC data:float diff --git a/config/SOUE01/rels/d_a_obj_hit_lever_swNP/symbols.txt b/config/SOUE01/rels/d_a_obj_hit_lever_swNP/symbols.txt index fc976319..2aaecd2b 100644 --- a/config/SOUE01/rels/d_a_obj_hit_lever_swNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_hit_lever_swNP/symbols.txt @@ -58,7 +58,7 @@ g_profile_OBJ_HIT_LEVER_SW = .data:0x00000000; // type:object size:0x10 data:4by lbl_348_data_10 = .data:0x00000010; // type:object size:0x2C lbl_348_data_3C = .data:0x0000003C; // type:object size:0x40 lbl_348_data_7C = .data:0x0000007C; // type:object size:0x24 -lbl_348_data_A0 = .data:0x000000A0; // type:object size:0x80 +AcOhitLeverSw__vtable = .data:0x000000A0; // type:object size:0x80 lbl_348_data_120 = .data:0x00000120; // type:object size:0x30 lbl_348_data_150 = .data:0x00000150; // type:object size:0x30 lbl_348_data_180 = .data:0x00000180; // type:object size:0x18 @@ -67,6 +67,6 @@ lbl_348_data_1B0 = .data:0x000001B0; // type:object size:0xE8 lbl_348_data_298 = .data:0x00000298; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_348_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_348_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_348_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_348_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +AcOhitLeverSw__STATE_RIGHT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOhitLeverSw__STATE_LEFT = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOhitLeverSw__STATE_MOVE = .bss:0x00000098; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_hole_minigameNP/symbols.txt b/config/SOUE01/rels/d_a_obj_hole_minigameNP/symbols.txt index 18e616ab..82464381 100644 --- a/config/SOUE01/rels/d_a_obj_hole_minigameNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_hole_minigameNP/symbols.txt @@ -80,7 +80,7 @@ lbl_349_data_10 = .data:0x00000010; // type:object size:0x10 lbl_349_data_20 = .data:0x00000020; // type:object size:0x10 lbl_349_data_30 = .data:0x00000030; // type:object size:0x20 data:string lbl_349_data_50 = .data:0x00000050; // type:object size:0x40 -lbl_349_data_90 = .data:0x00000090; // type:object size:0x80 +AcOHoleMinigame__vtable = .data:0x00000090; // type:object size:0x80 lbl_349_data_110 = .data:0x00000110; // type:object size:0x30 lbl_349_data_140 = .data:0x00000140; // type:object size:0x30 lbl_349_data_170 = .data:0x00000170; // type:object size:0x18 @@ -90,8 +90,8 @@ lbl_349_data_314 = .data:0x00000314; // type:object size:0x34 lbl_349_data_348 = .data:0x00000348; // type:object size:0x8 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_349_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_349_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_349_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_349_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_349_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_349_bss_118 = .bss:0x00000118; // type:object size:0x30 data:4byte +AcOHoleMinigame__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOHoleMinigame__STATE_START = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOHoleMinigame__STATE_PLAY = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOHoleMinigame__STATE_MESSAGE = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOHoleMinigame__STATE_CLEAR = .bss:0x00000118; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_insect_islandNP/symbols.txt b/config/SOUE01/rels/d_a_obj_insect_islandNP/symbols.txt index a240e10b..955938fa 100644 --- a/config/SOUE01/rels/d_a_obj_insect_islandNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_insect_islandNP/symbols.txt @@ -13,4 +13,4 @@ _dtors = .dtors:0x00000000; // type:label scope:global lbl_386_rodata_0 = .rodata:0x00000000; // type:object size:0x20 data:float g_profile_OBJ_INSECT_ISLAND = .data:0x00000000; // type:object size:0x80 lbl_386_data_80 = .data:0x00000080; // type:object size:0x20 data:string -lbl_386_data_A0 = .data:0x000000A0; // type:object size:0x8C +AcOinsectIsland__vtable = .data:0x000000A0; // type:object size:0x8C diff --git a/config/SOUE01/rels/d_a_obj_iron_stageNP/symbols.txt b/config/SOUE01/rels/d_a_obj_iron_stageNP/symbols.txt index 98e2a2d5..6845765f 100644 --- a/config/SOUE01/rels/d_a_obj_iron_stageNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_iron_stageNP/symbols.txt @@ -13,4 +13,4 @@ _dtors = .dtors:0x00000000; // type:label scope:global lbl_362_rodata_0 = .rodata:0x00000000; // type:object size:0x1C data:float g_profile_OBJ_IRON_STAGE = .data:0x00000000; // type:object size:0x44 lbl_362_data_44 = .data:0x00000044; // type:object size:0x24 -lbl_362_data_68 = .data:0x00000068; // type:object size:0x80 +AcOironStage__vtable = .data:0x00000068; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_island_LODNP/symbols.txt b/config/SOUE01/rels/d_a_obj_island_LODNP/symbols.txt index b7eda9ac..0af0caba 100644 --- a/config/SOUE01/rels/d_a_obj_island_LODNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_island_LODNP/symbols.txt @@ -10,9 +10,9 @@ fn_426_250 = .text:0x00000250; // type:function size:0x78 __dt__15dAcOislandLOD_cFv = .text:0x000002D0; // type:function size:0x68 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -lbl_426_rodata_0 = .rodata:0x00000000; // type:object size:0x14 -lbl_426_rodata_14 = .rodata:0x00000014; // type:object size:0x14 -lbl_426_rodata_28 = .rodata:0x00000028; // type:object size:0x4 data:float +dAcOislandLOD__resFilenames = .rodata:0x00000000; // type:object size:0x14 +dAcOislandLOD__resMdlNames = .rodata:0x00000014; // type:object size:0x14 +dAcOislandLOD__cullingDist = .rodata:0x00000028; // type:object size:0x4 data:float lbl_426_data_0 = .data:0x00000000; // type:object size:0x8 data:string lbl_426_data_8 = .data:0x00000008; // type:object size:0x8 data:string lbl_426_data_10 = .data:0x00000010; // type:object size:0x8 data:string diff --git a/config/SOUE01/rels/d_a_obj_island_nusiNP/symbols.txt b/config/SOUE01/rels/d_a_obj_island_nusiNP/symbols.txt index 902714ea..22eae6a7 100644 --- a/config/SOUE01/rels/d_a_obj_island_nusiNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_island_nusiNP/symbols.txt @@ -44,8 +44,8 @@ isSameName__31sFStateID_c<16dAcOislandNusi_c>CFPCc = .text:0x00000F40; // type:f _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global -lbl_413_rodata_0 = .rodata:0x00000000; // type:object size:0x8 scope:local data:float -lbl_413_rodata_8 = .rodata:0x00000008; // type:object size:0x24 scope:local data:4byte +dAcOislandNusi_c__someFloat = .rodata:0x00000000; // type:object size:0x8 scope:local data:float +sMdlNames = .rodata:0x00000008; // type:object size:0x24 scope:local data:4byte lbl_413_data_0 = .data:0x00000000; // type:object size:0x8 scope:local data:4byte lbl_413_data_8 = .data:0x00000008; // type:object size:0x10 scope:local g_profile_OBJ_ISLAND_NUSI = .data:0x00000018; // type:object size:0x10 diff --git a/config/SOUE01/rels/d_a_obj_item_heart_containerNP/symbols.txt b/config/SOUE01/rels/d_a_obj_item_heart_containerNP/symbols.txt index df307f0e..6146940e 100644 --- a/config/SOUE01/rels/d_a_obj_item_heart_containerNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_item_heart_containerNP/symbols.txt @@ -114,7 +114,7 @@ lbl_545_data_10 = .data:0x00000010; // type:object size:0x10 lbl_545_data_20 = .data:0x00000020; // type:object size:0x10 lbl_545_data_30 = .data:0x00000030; // type:object size:0x10 lbl_545_data_40 = .data:0x00000040; // type:object size:0x50 -lbl_545_data_90 = .data:0x00000090; // type:object size:0x80 +AcOItemHeartContainer__vtable = .data:0x00000090; // type:object size:0x80 lbl_545_data_110 = .data:0x00000110; // type:object size:0x30 lbl_545_data_140 = .data:0x00000140; // type:object size:0x30 lbl_545_data_170 = .data:0x00000170; // type:object size:0x18 @@ -123,12 +123,12 @@ lbl_545_data_1A0 = .data:0x000001A0; // type:object size:0x298 lbl_545_data_438 = .data:0x00000438; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_545_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_545_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_545_bss_58 = .bss:0x00000058; // type:object size:0x80 data:4byte -lbl_545_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_545_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_545_bss_158 = .bss:0x00000158; // type:object size:0x40 data:4byte -lbl_545_bss_198 = .bss:0x00000198; // type:object size:0x40 data:4byte -lbl_545_bss_1D8 = .bss:0x000001D8; // type:object size:0x30 data:4byte +AcOItemHeartContainer__STATE_HIDE = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOItemHeartContainer__STATE_REQUEST_APPEAR_EVENT = .bss:0x00000058; // type:object size:0x80 data:4byte +AcOItemHeartContainer__STATE_APPEAR = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOItemHeartContainer__STATE_WAIT_FALL = .bss:0x00000118; // type:object size:0x40 data:4byte +AcOItemHeartContainer__STATE_FALL = .bss:0x00000158; // type:object size:0x40 data:4byte +AcOItemHeartContainer__STATE_WAIT_GET = .bss:0x00000198; // type:object size:0x40 data:4byte +AcOItemHeartContainer__STATE_WAIT_GET_QUAKE = .bss:0x000001D8; // type:object size:0x30 data:4byte lbl_545_bss_208 = .bss:0x00000208; // type:object size:0x1 data:byte -lbl_545_bss_20C = .bss:0x0000020C; // type:object size:0xC data:float +Vec3f_ItemHeartContainer_update = .bss:0x0000020C; // type:object size:0xC data:float diff --git a/config/SOUE01/rels/d_a_obj_ivy_ropeNP/symbols.txt b/config/SOUE01/rels/d_a_obj_ivy_ropeNP/symbols.txt index 22205c68..976e6fe9 100644 --- a/config/SOUE01/rels/d_a_obj_ivy_ropeNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_ivy_ropeNP/symbols.txt @@ -194,7 +194,7 @@ lbl_256_data_FC = .data:0x000000FC; // type:object size:0xC lbl_256_data_108 = .data:0x00000108; // type:object size:0xDC lbl_256_data_1E4 = .data:0x000001E4; // type:object size:0x4 data:4byte lbl_256_data_1E8 = .data:0x000001E8; // type:object size:0x8 data:4byte -lbl_256_data_1F0 = .data:0x000001F0; // type:object size:0x80 +AcOivyRope__vtable = .data:0x000001F0; // type:object size:0x80 lbl_256_data_270 = .data:0x00000270; // type:object size:0x30 lbl_256_data_2A0 = .data:0x000002A0; // type:object size:0x30 lbl_256_data_2D0 = .data:0x000002D0; // type:object size:0x18 @@ -206,9 +206,9 @@ lbl_256_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte lbl_256_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte lbl_256_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte lbl_256_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_256_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_256_bss_118 = .bss:0x00000118; // type:object size:0xC0 data:4byte -lbl_256_bss_1D8 = .bss:0x000001D8; // type:object size:0x40 data:4byte -lbl_256_bss_218 = .bss:0x00000218; // type:object size:0x70 data:4byte +AcOivyRope__STATE_ROPE_CUT = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOivyRope__STATE_TERRY_ROPE_WAIT = .bss:0x00000118; // type:object size:0xC0 data:4byte +AcOivyRope__STATE_TERRY_ROPE_INIT = .bss:0x000001D8; // type:object size:0x40 data:4byte +AcOivyRope__STATE_TERRY_ROPE_PLAYER_CARRY = .bss:0x00000218; // type:object size:0x70 data:4byte lbl_256_bss_288 = .bss:0x00000288; // type:object size:0x8 data:byte lbl_256_bss_290 = .bss:0x00000290; // type:object size:0x10 data:float diff --git a/config/SOUE01/rels/d_a_obj_junk_repairingNP/symbols.txt b/config/SOUE01/rels/d_a_obj_junk_repairingNP/symbols.txt index 4c052da4..8e3ff7ca 100644 --- a/config/SOUE01/rels/d_a_obj_junk_repairingNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_junk_repairingNP/symbols.txt @@ -44,7 +44,7 @@ isSameName__28sFStateID_c<13dAcOJunkRep_c>CFPCc = .text:0x00000C80; // type:func _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global -lbl_116_rodata_0 = .rodata:0x00000000; // type:object size:0x30 scope:local data:float +dAcOJunkRep_c__sSomeFloat = .rodata:0x00000000; // type:object size:0x30 scope:local data:float g_profile_OBJ_JUNK_REPAIR = .data:0x00000000; // type:object size:0x10 data:4byte lbl_116_data_10 = .data:0x00000010; // type:object size:0x8 scope:local lbl_116_data_18 = .data:0x00000018; // type:object size:0x20 scope:local diff --git a/config/SOUE01/rels/d_a_obj_kibakoNP/symbols.txt b/config/SOUE01/rels/d_a_obj_kibakoNP/symbols.txt index 97a986af..d29308cb 100644 --- a/config/SOUE01/rels/d_a_obj_kibakoNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_kibakoNP/symbols.txt @@ -89,16 +89,16 @@ g_profile_OBJ_KIBAKO = .data:0x00000000; // type:object size:0x80 data:4byte lbl_561_data_80 = .data:0x00000080; // type:object size:0x14 lbl_561_data_94 = .data:0x00000094; // type:object size:0x18 lbl_561_data_AC = .data:0x000000AC; // type:object size:0x34 -lbl_561_data_E0 = .data:0x000000E0; // type:object size:0x80 -lbl_561_data_160 = .data:0x00000160; // type:object size:0x30 -lbl_561_data_190 = .data:0x00000190; // type:object size:0x30 +AcOkibako__vtable = .data:0x000000E0; // type:object size:0x80 +AcOkibako__stateMgr_vtable = .data:0x00000160; // type:object size:0x30 +AcOkibako__stateMgr_vtable_base = .data:0x00000190; // type:object size:0x30 lbl_561_data_1C0 = .data:0x000001C0; // type:object size:0x18 lbl_561_data_1D8 = .data:0x000001D8; // type:object size:0x18 lbl_561_data_1F0 = .data:0x000001F0; // type:object size:0x15C lbl_561_data_34C = .data:0x0000034C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_561_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_561_bss_18 = .bss:0x00000018; // type:object size:0x80 data:4byte -lbl_561_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_561_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_561_bss_118 = .bss:0x00000118; // type:object size:0x48 data:4byte +AcOkibako__STATE_WAIT = .bss:0x00000018; // type:object size:0x80 data:4byte +AcOkibako__STATE_PUSHPULL = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOkibako__STATE_ROPE_GRAB = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOkibako__STATE_DELETE_EVENT = .bss:0x00000118; // type:object size:0x48 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_kumite_wallNP/symbols.txt b/config/SOUE01/rels/d_a_obj_kumite_wallNP/symbols.txt index a2960feb..b727e19a 100644 --- a/config/SOUE01/rels/d_a_obj_kumite_wallNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_kumite_wallNP/symbols.txt @@ -63,6 +63,6 @@ lbl_432_section4_1C0 = .data:0x000001C0; // type:object size:0x134 lbl_432_section4_2F4 = .data:0x000002F4; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_432_bss_8 = .bss:0x00000008; // type:object size:0x50 data:4byte -lbl_432_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_432_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_432_bss_D8 = .bss:0x000000D8; // type:object size:0x30 data:4byte +AcOkumiteWall__STATE_APPEAR = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOkumiteWall__STATE_EXIST = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOkumiteWall__STATE_VANISH = .bss:0x000000D8; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_lava_plateNP/symbols.txt b/config/SOUE01/rels/d_a_obj_lava_plateNP/symbols.txt index 2f2d6e03..cb6f7a3c 100644 --- a/config/SOUE01/rels/d_a_obj_lava_plateNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_lava_plateNP/symbols.txt @@ -57,7 +57,7 @@ lbl_473_rodata_10 = .rodata:0x00000010; // type:object size:0xC lbl_473_rodata_1C = .rodata:0x0000001C; // type:object size:0x3C data:float g_profile_OBJ_LAVA_PLATE = .data:0x00000000; // type:object size:0x44 data:4byte lbl_473_data_44 = .data:0x00000044; // type:object size:0x2C -lbl_473_data_70 = .data:0x00000070; // type:object size:0x80 +AcOLavaPlate__vtable = .data:0x00000070; // type:object size:0x80 lbl_473_data_F0 = .data:0x000000F0; // type:object size:0x30 lbl_473_data_120 = .data:0x00000120; // type:object size:0x30 lbl_473_data_150 = .data:0x00000150; // type:object size:0x18 @@ -65,7 +65,7 @@ lbl_473_data_168 = .data:0x00000168; // type:object size:0xE8 lbl_473_data_250 = .data:0x00000250; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_473_bss_8 = .bss:0x00000008; // type:object size:0x50 data:4byte -lbl_473_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_473_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +AcOLavaPlate__STATE_MOVE = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOLavaPlate__STATE_SUCCESS = .bss:0x00000098; // type:object size:0x30 data:4byte lbl_473_bss_C8 = .bss:0x000000C8; // type:object size:0x1 data:byte lbl_473_bss_CC = .bss:0x000000CC; // type:object size:0xC data:float diff --git a/config/SOUE01/rels/d_a_obj_leaf_swingNP/symbols.txt b/config/SOUE01/rels/d_a_obj_leaf_swingNP/symbols.txt index 22b3dd77..0a4d8d14 100644 --- a/config/SOUE01/rels/d_a_obj_leaf_swingNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_leaf_swingNP/symbols.txt @@ -62,7 +62,7 @@ g_profile_OBJ_LEAF_SWING = .data:0x00000000; // type:object size:0x70 data:4byte lbl_254_data_70 = .data:0x00000070; // type:object size:0x30 lbl_254_data_A0 = .data:0x000000A0; // type:object size:0x20 lbl_254_data_C0 = .data:0x000000C0; // type:object size:0x78 -lbl_254_data_138 = .data:0x00000138; // type:object size:0x80 +AcOleafSwing__vtable = .data:0x00000138; // type:object size:0x80 lbl_254_data_1B8 = .data:0x000001B8; // type:object size:0x30 lbl_254_data_1E8 = .data:0x000001E8; // type:object size:0x30 lbl_254_data_218 = .data:0x00000218; // type:object size:0x18 @@ -70,4 +70,4 @@ lbl_254_data_230 = .data:0x00000230; // type:object size:0x60 lbl_254_data_290 = .data:0x00000290; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_254_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_254_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcOleafSwing__STATE_SWING_CALC = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_light_lineNP/symbols.txt b/config/SOUE01/rels/d_a_obj_light_lineNP/symbols.txt index 87ac1d62..80321a8e 100644 --- a/config/SOUE01/rels/d_a_obj_light_lineNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_light_lineNP/symbols.txt @@ -61,7 +61,7 @@ lbl_274_data_40 = .data:0x00000040; // type:object size:0x14 lbl_274_data_54 = .data:0x00000054; // type:object size:0x28 lbl_274_data_7C = .data:0x0000007C; // type:object size:0x20 lbl_274_data_9C = .data:0x0000009C; // type:object size:0x14 -lbl_274_data_B0 = .data:0x000000B0; // type:object size:0x80 +AcOLightLine__vtable = .data:0x000000B0; // type:object size:0x80 lbl_274_data_130 = .data:0x00000130; // type:object size:0x30 lbl_274_data_160 = .data:0x00000160; // type:object size:0x30 lbl_274_data_190 = .data:0x00000190; // type:object size:0x18 @@ -69,7 +69,7 @@ lbl_274_data_1A8 = .data:0x000001A8; // type:object size:0xA8 lbl_274_data_250 = .data:0x00000250; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_274_bss_8 = .bss:0x00000008; // type:object size:0x10 data:2byte -lbl_274_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_274_bss_58 = .bss:0x00000058; // type:object size:0x50 data:4byte +AcOLightLine__STATE_OUTSIDE = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOLightLine__STATE_INSIDE = .bss:0x00000058; // type:object size:0x50 data:4byte lbl_274_bss_A8 = .bss:0x000000A8; // type:object size:0x6 data:2byte lbl_274_bss_AE = .bss:0x000000AE; // type:object size:0x1 data:byte diff --git a/config/SOUE01/rels/d_a_obj_lighthouse_harpNP/symbols.txt b/config/SOUE01/rels/d_a_obj_lighthouse_harpNP/symbols.txt index 23710e74..23471479 100644 --- a/config/SOUE01/rels/d_a_obj_lighthouse_harpNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_lighthouse_harpNP/symbols.txt @@ -76,7 +76,7 @@ g_profile_OBJ_LIGHTHOUSE_HARP = .data:0x00000000; // type:object size:0xA0 data: lbl_377_data_A0 = .data:0x000000A0; // type:object size:0x10 lbl_377_data_B0 = .data:0x000000B0; // type:object size:0x10 data:string lbl_377_data_C0 = .data:0x000000C0; // type:object size:0x18 -lbl_377_data_D8 = .data:0x000000D8; // type:object size:0x80 +AcOlighthouseHarp__vtable = .data:0x000000D8; // type:object size:0x80 lbl_377_data_158 = .data:0x00000158; // type:object size:0x30 lbl_377_data_188 = .data:0x00000188; // type:object size:0x30 lbl_377_data_1B8 = .data:0x000001B8; // type:object size:0x18 @@ -84,7 +84,7 @@ lbl_377_data_1D0 = .data:0x000001D0; // type:object size:0x1AC lbl_377_data_37C = .data:0x0000037C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_377_bss_8 = .bss:0x00000008; // type:object size:0x50 data:4byte -lbl_377_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_377_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_377_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_377_bss_118 = .bss:0x00000118; // type:object size:0x30 data:4byte +AcOlighthouseHarp__STATE_MOVE = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOlighthouseHarp__STATE_APPEAR = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOlighthouseHarp__STATE_ROLL = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOlighthouseHarp__STATE_HARP_FINISH = .bss:0x00000118; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_lighthouse_lightNP/symbols.txt b/config/SOUE01/rels/d_a_obj_lighthouse_lightNP/symbols.txt index a0325891..f6290f0f 100644 --- a/config/SOUE01/rels/d_a_obj_lighthouse_lightNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_lighthouse_lightNP/symbols.txt @@ -59,7 +59,7 @@ lbl_376_rodata_24 = .rodata:0x00000024; // type:object size:0x24 data:float g_profile_OBJ_LIGHTHOUSE_LIGHT = .data:0x00000000; // type:object size:0x10 data:4byte lbl_376_data_10 = .data:0x00000010; // type:object size:0x28 lbl_376_data_38 = .data:0x00000038; // type:object size:0x28 -lbl_376_data_60 = .data:0x00000060; // type:object size:0x80 +AcOlighthouseLight__vtable = .data:0x00000060; // type:object size:0x80 lbl_376_data_E0 = .data:0x000000E0; // type:object size:0x30 lbl_376_data_110 = .data:0x00000110; // type:object size:0x30 lbl_376_data_140 = .data:0x00000140; // type:object size:0x18 @@ -67,6 +67,6 @@ lbl_376_data_158 = .data:0x00000158; // type:object size:0xF4 lbl_376_data_24C = .data:0x0000024C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_376_bss_8 = .bss:0x00000008; // type:object size:0x28 data:4byte -lbl_376_bss_30 = .bss:0x00000030; // type:object size:0x40 data:4byte -lbl_376_bss_70 = .bss:0x00000070; // type:object size:0x40 data:4byte -lbl_376_bss_B0 = .bss:0x000000B0; // type:object size:0x30 data:4byte +AcOlighthouseLight__StateID_Wait = .bss:0x00000030; // type:object size:0x40 data:4byte +AcOlighthouseLight__StateID_Move = .bss:0x00000070; // type:object size:0x40 data:4byte +AcOlighthouseLight__StateID_Appear = .bss:0x000000B0; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_logNP/symbols.txt b/config/SOUE01/rels/d_a_obj_logNP/symbols.txt index c173386a..db578b21 100644 --- a/config/SOUE01/rels/d_a_obj_logNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_logNP/symbols.txt @@ -94,7 +94,7 @@ lbl_218_data_10 = .data:0x00000010; // type:object size:0x70 lbl_218_data_80 = .data:0x00000080; // type:object size:0x18 lbl_218_data_98 = .data:0x00000098; // type:object size:0x4 data:4byte lbl_218_data_9C = .data:0x0000009C; // type:object size:0x4 data:4byte -lbl_218_data_A0 = .data:0x000000A0; // type:object size:0x80 +AcOLog__vtable = .data:0x000000A0; // type:object size:0x80 lbl_218_data_120 = .data:0x00000120; // type:object size:0x30 lbl_218_data_150 = .data:0x00000150; // type:object size:0x30 lbl_218_data_180 = .data:0x00000180; // type:object size:0x18 @@ -103,10 +103,10 @@ lbl_218_data_1B0 = .data:0x000001B0; // type:object size:0x144 lbl_218_data_2F4 = .data:0x000002F4; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_218_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_218_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_218_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_218_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_218_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_218_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte +AcOLog__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOLog__STATE_MOVE = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOLog__STATE_MOVE_END = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOLog__STATE_FALL = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOLog__STATE_SHAKE = .bss:0x00000118; // type:object size:0x40 data:4byte lbl_218_bss_158 = .bss:0x00000158; // type:object size:0x8 data:byte lbl_218_bss_160 = .bss:0x00000160; // type:object size:0x18 data:float diff --git a/config/SOUE01/rels/d_a_obj_log_waterNP/symbols.txt b/config/SOUE01/rels/d_a_obj_log_waterNP/symbols.txt index b3758ba8..6426e560 100644 --- a/config/SOUE01/rels/d_a_obj_log_waterNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_log_waterNP/symbols.txt @@ -64,13 +64,13 @@ lbl_219_data_50 = .data:0x00000050; // type:object size:0x18 lbl_219_data_68 = .data:0x00000068; // type:object size:0x18 lbl_219_data_80 = .data:0x00000080; // type:object size:0x18 lbl_219_data_98 = .data:0x00000098; // type:object size:0x20 -lbl_219_data_B8 = .data:0x000000B8; // type:object size:0x80 +AcOlogWater__vtable = .data:0x000000B8; // type:object size:0x80 lbl_219_data_138 = .data:0x00000138; // type:object size:0x30 lbl_219_data_168 = .data:0x00000168; // type:object size:0x30 lbl_219_data_198 = .data:0x00000198; // type:object size:0x18 lbl_219_data_1B0 = .data:0x000001B0; // type:object size:0x18 -lbl_219_data_1C8 = .data:0x000001C8; // type:object size:0x50 +someDtor = .data:0x000001C8; // type:object size:0x50 lbl_219_data_218 = .data:0x00000218; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_219_bss_8 = .bss:0x00000008; // type:object size:0x10 data:float -lbl_219_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOlogWater__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_lotusNP/symbols.txt b/config/SOUE01/rels/d_a_obj_lotusNP/symbols.txt index f45b4ce5..85d77b7e 100644 --- a/config/SOUE01/rels/d_a_obj_lotusNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_lotusNP/symbols.txt @@ -75,7 +75,7 @@ lbl_287_data_11C = .data:0x0000011C; // type:object size:0x18 lbl_287_data_134 = .data:0x00000134; // type:object size:0x48 lbl_287_data_17C = .data:0x0000017C; // type:object size:0x4 data:float lbl_287_data_180 = .data:0x00000180; // type:object size:0x8 data:float -lbl_287_data_188 = .data:0x00000188; // type:object size:0x80 +AcOLotus__vtable = .data:0x00000188; // type:object size:0x80 lbl_287_data_208 = .data:0x00000208; // type:object size:0x30 lbl_287_data_238 = .data:0x00000238; // type:object size:0x30 lbl_287_data_268 = .data:0x00000268; // type:object size:0x18 @@ -83,7 +83,7 @@ lbl_287_data_280 = .data:0x00000280; // type:object size:0x120 lbl_287_data_3A0 = .data:0x000003A0; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_287_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_287_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_287_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_287_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_287_bss_D8 = .bss:0x000000D8; // type:object size:0x30 data:4byte +AcOLotus__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOLotus__STATE_REVERSE = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOLotus__STATE_ROTATE = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOLotus__STATE_END_ROTATE = .bss:0x000000D8; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_megami_islandNP/symbols.txt b/config/SOUE01/rels/d_a_obj_megami_islandNP/symbols.txt index 8ac0ed4b..f0c25b8b 100644 --- a/config/SOUE01/rels/d_a_obj_megami_islandNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_megami_islandNP/symbols.txt @@ -11,7 +11,7 @@ hasGoddessStatueFallen__18dAcOmegamiIsland_cFv = .text:0x00000520; // type:funct __dt__18dAcOmegamiIsland_cFv = .text:0x00000570; // type:function size:0x8C _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -lbl_397_rodata_0 = .rodata:0x00000000; // type:object size:0x48 scope:local data:float +sResFiles = .rodata:0x00000000; // type:object size:0x48 scope:local data:float lbl_397_data_0 = .data:0x00000000; // type:object size:0x10 scope:local lbl_397_data_10 = .data:0x00000010; // type:object size:0x10 scope:local data:string lbl_397_data_20 = .data:0x00000020; // type:object size:0x10 scope:local diff --git a/config/SOUE01/rels/d_a_obj_mole_coverNP/symbols.txt b/config/SOUE01/rels/d_a_obj_mole_coverNP/symbols.txt index bb47263f..5cf2e2ab 100644 --- a/config/SOUE01/rels/d_a_obj_mole_coverNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_mole_coverNP/symbols.txt @@ -13,4 +13,4 @@ _dtors = .dtors:0x00000000; // type:label scope:global lbl_424_rodata_0 = .rodata:0x00000000; // type:object size:0x1C data:float g_profile_OBJ_MOLE_COVER = .data:0x00000000; // type:object size:0x6C lbl_424_data_6C = .data:0x0000006C; // type:object size:0x24 -lbl_424_data_90 = .data:0x00000090; // type:object size:0x80 +AcOmoleCover__vtable = .data:0x00000090; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_mole_soilNP/symbols.txt b/config/SOUE01/rels/d_a_obj_mole_soilNP/symbols.txt index 1c3c22e8..277450df 100644 --- a/config/SOUE01/rels/d_a_obj_mole_soilNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_mole_soilNP/symbols.txt @@ -46,7 +46,7 @@ isSameName__29sFStateID_c<14dAcOmoleSoil_c>CFPCc = .text:0x00000E90; // type:fun _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global -lbl_101_rodata_0 = .rodata:0x00000000; // type:object size:0x8 scope:local data:float +dAcOmoleSoil_c__sHalfScale = .rodata:0x00000000; // type:object size:0x8 scope:local data:float lbl_101_rodata_8 = .rodata:0x00000008; // type:object size:0x10 scope:local data:float lbl_101_rodata_18 = .rodata:0x00000018; // type:object size:0x4 scope:local data:float lbl_101_rodata_1C = .rodata:0x0000001C; // type:object size:0x14 scope:local data:float diff --git a/config/SOUE01/rels/d_a_obj_move_lift_volNP/symbols.txt b/config/SOUE01/rels/d_a_obj_move_lift_volNP/symbols.txt index dc3e0dd8..95793b69 100644 --- a/config/SOUE01/rels/d_a_obj_move_lift_volNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_move_lift_volNP/symbols.txt @@ -92,7 +92,7 @@ lbl_259_data_1AC = .data:0x000001AC; // type:object size:0xC data:string lbl_259_data_1B8 = .data:0x000001B8; // type:object size:0x10 data:string lbl_259_data_1C8 = .data:0x000001C8; // type:object size:0x4 data:4byte lbl_259_data_1CC = .data:0x000001CC; // type:object size:0x4 data:4byte -lbl_259_data_1D0 = .data:0x000001D0; // type:object size:0x80 +AcOmoveLiftVol__vtable = .data:0x000001D0; // type:object size:0x80 lbl_259_data_250 = .data:0x00000250; // type:object size:0x30 lbl_259_data_280 = .data:0x00000280; // type:object size:0x30 lbl_259_data_2B0 = .data:0x000002B0; // type:object size:0x18 @@ -101,11 +101,11 @@ lbl_259_data_2E0 = .data:0x000002E0; // type:object size:0x1C0 lbl_259_data_4A0 = .data:0x000004A0; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_259_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_259_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_259_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_259_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_259_bss_D8 = .bss:0x000000D8; // type:object size:0x80 data:4byte -lbl_259_bss_158 = .bss:0x00000158; // type:object size:0x30 data:4byte +AcOmoveLiftVol__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOmoveLiftVol__STATE_READY = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOmoveLiftVol__STATE_MOVE = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOmoveLiftVol__STATE_ARRIVE = .bss:0x000000D8; // type:object size:0x80 data:4byte +AcOmoveLiftVol__STATE_ROPE_MOVE = .bss:0x00000158; // type:object size:0x30 data:4byte lbl_259_bss_188 = .bss:0x00000188; // type:object size:0x8 data:byte lbl_259_bss_190 = .bss:0x00000190; // type:object size:0x10 data:float lbl_259_bss_1A0 = .bss:0x000001A0; // type:object size:0x8 data:byte diff --git a/config/SOUE01/rels/d_a_obj_mushroomNP/symbols.txt b/config/SOUE01/rels/d_a_obj_mushroomNP/symbols.txt index 91b27393..5c66d91c 100644 --- a/config/SOUE01/rels/d_a_obj_mushroomNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_mushroomNP/symbols.txt @@ -113,7 +113,7 @@ lbl_328_data_2D8 = .data:0x000002D8; // type:object size:0x94 lbl_328_data_36C = .data:0x0000036C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_328_bss_8 = .bss:0x00000008; // type:object size:0x70 data:4byte -lbl_328_bss_78 = .bss:0x00000078; // type:object size:0x70 data:4byte +AcOMushRoom__StateID_Wait = .bss:0x00000078; // type:object size:0x70 data:4byte lbl_328_bss_E8 = .bss:0x000000E8; // type:object size:0xDF8 data:byte lbl_328_bss_EE0 = .bss:0x00000EE0; // type:object size:0x8 data:byte lbl_328_bss_EE8 = .bss:0x00000EE8; // type:object size:0x30 data:float diff --git a/config/SOUE01/rels/d_a_obj_needle_desertNP/symbols.txt b/config/SOUE01/rels/d_a_obj_needle_desertNP/symbols.txt index 55d21fb6..d67d74c3 100644 --- a/config/SOUE01/rels/d_a_obj_needle_desertNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_needle_desertNP/symbols.txt @@ -51,7 +51,7 @@ lbl_594_rodata_0 = .rodata:0x00000000; // type:object size:0x8 data:float lbl_594_rodata_8 = .rodata:0x00000008; // type:object size:0x4 data:float lbl_594_rodata_C = .rodata:0x0000000C; // type:object size:0x28 data:float g_profile_OBJ_NEEDLE_DESERT = .data:0x00000000; // type:object size:0xC0 data:4byte -lbl_594_data_C0 = .data:0x000000C0; // type:object size:0x80 +AcONeedleDesert__vtable = .data:0x000000C0; // type:object size:0x80 lbl_594_data_140 = .data:0x00000140; // type:object size:0x30 lbl_594_data_170 = .data:0x00000170; // type:object size:0x30 lbl_594_data_1A0 = .data:0x000001A0; // type:object size:0x18 @@ -60,5 +60,5 @@ lbl_594_data_1D0 = .data:0x000001D0; // type:object size:0xA0 lbl_594_data_270 = .data:0x00000270; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_594_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_594_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_594_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcONeedleDesert__StateID_On = .bss:0x00000018; // type:object size:0x40 data:4byte +AcONeedleDesert__StateID_Off = .bss:0x00000058; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_needle_undergroundNP/symbols.txt b/config/SOUE01/rels/d_a_obj_needle_undergroundNP/symbols.txt index a22584b0..f28afd73 100644 --- a/config/SOUE01/rels/d_a_obj_needle_undergroundNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_needle_undergroundNP/symbols.txt @@ -88,7 +88,7 @@ lbl_482_data_1C = .data:0x0000001C; // type:object size:0x8 lbl_482_data_24 = .data:0x00000024; // type:object size:0x8 lbl_482_data_2C = .data:0x0000002C; // type:object size:0x28 lbl_482_data_54 = .data:0x00000054; // type:object size:0x14 -lbl_482_data_68 = .data:0x00000068; // type:object size:0x80 +AcONeedleUnderground__vtable = .data:0x00000068; // type:object size:0x80 lbl_482_data_E8 = .data:0x000000E8; // type:object size:0x30 lbl_482_data_118 = .data:0x00000118; // type:object size:0x30 lbl_482_data_148 = .data:0x00000148; // type:object size:0x18 @@ -98,5 +98,5 @@ lbl_482_data_2CC = .data:0x000002CC; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_482_bss_8 = .bss:0x00000008; // type:object size:0xC data:4byte lbl_482_bss_14 = .bss:0x00000014; // type:object size:0x1C data:float -lbl_482_bss_30 = .bss:0x00000030; // type:object size:0x80 data:4byte -lbl_482_bss_B0 = .bss:0x000000B0; // type:object size:0x70 data:4byte +AcONeedleUnderground__STATE_REMAIN_OPEN = .bss:0x00000030; // type:object size:0x80 data:4byte +AcONeedleUnderground__STATE_REMAIN_CLOSED = .bss:0x000000B0; // type:object size:0x70 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_oct_grassNP/symbols.txt b/config/SOUE01/rels/d_a_obj_oct_grassNP/symbols.txt index 79558a4b..876e5cf3 100644 --- a/config/SOUE01/rels/d_a_obj_oct_grassNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_oct_grassNP/symbols.txt @@ -47,15 +47,15 @@ lbl_289_data_10 = .data:0x00000010; // type:object size:0xC lbl_289_data_1C = .data:0x0000001C; // type:object size:0x10 lbl_289_data_2C = .data:0x0000002C; // type:object size:0xC lbl_289_data_38 = .data:0x00000038; // type:object size:0x10 -lbl_289_data_48 = .data:0x00000048; // type:object size:0x10 +GRASS_OARCS = .data:0x00000048; // type:object size:0x10 lbl_289_data_58 = .data:0x00000058; // type:object size:0x10 lbl_289_data_68 = .data:0x00000068; // type:object size:0x10 lbl_289_data_78 = .data:0x00000078; // type:object size:0x10 lbl_289_data_88 = .data:0x00000088; // type:object size:0x10 -lbl_289_data_98 = .data:0x00000098; // type:object size:0x10 +GRASS_CUT_MODELS = .data:0x00000098; // type:object size:0x10 lbl_289_data_A8 = .data:0x000000A8; // type:object size:0x1C data:string lbl_289_data_C4 = .data:0x000000C4; // type:object size:0xC -lbl_289_data_D0 = .data:0x000000D0; // type:object size:0x80 +AcOOctGrass__vtable = .data:0x000000D0; // type:object size:0x80 lbl_289_data_150 = .data:0x00000150; // type:object size:0x30 lbl_289_data_180 = .data:0x00000180; // type:object size:0x30 lbl_289_data_1B0 = .data:0x000001B0; // type:object size:0x18 @@ -63,4 +63,4 @@ lbl_289_data_1C8 = .data:0x000001C8; // type:object size:0x5C lbl_289_data_224 = .data:0x00000224; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_289_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_289_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcOOctGrass__StateID_Wait = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_oct_grass_leafNP/symbols.txt b/config/SOUE01/rels/d_a_obj_oct_grass_leafNP/symbols.txt index f1f4e320..5e11e011 100644 --- a/config/SOUE01/rels/d_a_obj_oct_grass_leafNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_oct_grass_leafNP/symbols.txt @@ -77,8 +77,8 @@ lbl_290_data_70 = .data:0x00000070; // type:object size:0xC lbl_290_data_7C = .data:0x0000007C; // type:object size:0x10 lbl_290_data_8C = .data:0x0000008C; // type:object size:0xC lbl_290_data_98 = .data:0x00000098; // type:object size:0x10 -lbl_290_data_A8 = .data:0x000000A8; // type:object size:0x30 -lbl_290_data_D8 = .data:0x000000D8; // type:object size:0x80 +OCTA_MODELS = .data:0x000000A8; // type:object size:0x30 +AcOOctGrassLeaf__vtable = .data:0x000000D8; // type:object size:0x80 lbl_290_data_158 = .data:0x00000158; // type:object size:0x30 lbl_290_data_188 = .data:0x00000188; // type:object size:0x30 lbl_290_data_1B8 = .data:0x000001B8; // type:object size:0x18 @@ -87,9 +87,9 @@ lbl_290_data_1E8 = .data:0x000001E8; // type:object size:0x174 lbl_290_data_35C = .data:0x0000035C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_290_bss_8 = .bss:0x00000008; // type:object size:0x10 data:2byte -lbl_290_bss_18 = .bss:0x00000018; // type:object size:0xC0 data:4byte -lbl_290_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_290_bss_118 = .bss:0x00000118; // type:object size:0x30 data:4byte +AcOOctGrassLeaf__StateID_Wait = .bss:0x00000018; // type:object size:0xC0 data:4byte +AcOOctGrassLeaf__StateID_Grab = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOOctGrassLeaf__StateID_Broken = .bss:0x00000118; // type:object size:0x30 data:4byte lbl_290_bss_148 = .bss:0x00000148; // type:object size:0x8 data:2byte lbl_290_bss_150 = .bss:0x00000150; // type:object size:0x8 data:byte lbl_290_bss_158 = .bss:0x00000158; // type:object size:0x30 data:float diff --git a/config/SOUE01/rels/d_a_obj_paintNP/symbols.txt b/config/SOUE01/rels/d_a_obj_paintNP/symbols.txt index 3e5a4b86..3e6ac669 100644 --- a/config/SOUE01/rels/d_a_obj_paintNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_paintNP/symbols.txt @@ -51,7 +51,7 @@ lbl_613_data_10 = .data:0x00000010; // type:object size:0x1C lbl_613_data_2C = .data:0x0000002C; // type:object size:0x8 lbl_613_data_34 = .data:0x00000034; // type:object size:0x8 lbl_613_data_3C = .data:0x0000003C; // type:object size:0xC -lbl_613_data_48 = .data:0x00000048; // type:object size:0x80 +AcOpaint__vtable = .data:0x00000048; // type:object size:0x80 lbl_613_data_C8 = .data:0x000000C8; // type:object size:0x30 lbl_613_data_F8 = .data:0x000000F8; // type:object size:0x30 lbl_613_data_128 = .data:0x00000128; // type:object size:0x18 @@ -60,7 +60,7 @@ lbl_613_data_158 = .data:0x00000158; // type:object size:0x4C lbl_613_data_1A4 = .data:0x000001A4; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_613_bss_8 = .bss:0x00000008; // type:object size:0x10 data:2byte -lbl_613_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcOpaint__StateID_Wait = .bss:0x00000018; // type:object size:0x30 data:4byte lbl_613_bss_48 = .bss:0x00000048; // type:object size:0x2 data:2byte lbl_613_bss_4C = .bss:0x0000004C; // type:object size:0x2 data:2byte lbl_613_bss_4E = .bss:0x0000004E; // type:object size:0x1 data:byte diff --git a/config/SOUE01/rels/d_a_obj_pinwheelNP/symbols.txt b/config/SOUE01/rels/d_a_obj_pinwheelNP/symbols.txt index f88af572..cb5c2fac 100644 --- a/config/SOUE01/rels/d_a_obj_pinwheelNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_pinwheelNP/symbols.txt @@ -55,7 +55,7 @@ lbl_375_rodata_0 = .rodata:0x00000000; // type:object size:0x14 data:float g_profile_OBJ_PINWHEEL = .data:0x00000000; // type:object size:0x10 data:4byte lbl_375_data_10 = .data:0x00000010; // type:object size:0x60 lbl_375_data_70 = .data:0x00000070; // type:object size:0x20 -lbl_375_data_90 = .data:0x00000090; // type:object size:0x80 +AcOpinwheel__vtable = .data:0x00000090; // type:object size:0x80 lbl_375_data_110 = .data:0x00000110; // type:object size:0x30 lbl_375_data_140 = .data:0x00000140; // type:object size:0x30 lbl_375_data_170 = .data:0x00000170; // type:object size:0x18 @@ -63,7 +63,7 @@ lbl_375_data_188 = .data:0x00000188; // type:object size:0x140 lbl_375_data_2C8 = .data:0x000002C8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_375_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_375_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_375_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_375_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_375_bss_D8 = .bss:0x000000D8; // type:object size:0x30 data:4byte +AcOpinwheel__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOpinwheel__STATE_ACCELERATION = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOpinwheel__STATE_ROLL_MAX_SPEED = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOpinwheel__STATE_DECELERATION = .bss:0x000000D8; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_pot_salNP/symbols.txt b/config/SOUE01/rels/d_a_obj_pot_salNP/symbols.txt index 65dfffef..0f7a1d72 100644 --- a/config/SOUE01/rels/d_a_obj_pot_salNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_pot_salNP/symbols.txt @@ -75,7 +75,7 @@ lbl_100_rodata_30 = .rodata:0x00000030; // type:object size:0x4 data:float lbl_100_rodata_34 = .rodata:0x00000034; // type:object size:0x4 data:float g_profile_OBJ_POT_SAL = .data:0x00000000; // type:object size:0x40 data:4byte lbl_100_data_40 = .data:0x00000040; // type:object size:0x20 -lbl_100_data_60 = .data:0x00000060; // type:object size:0x100 +AcOPotSal__vtable = .data:0x00000060; // type:object size:0x100 lbl_100_data_160 = .data:0x00000160; // type:object size:0x30 lbl_100_data_190 = .data:0x00000190; // type:object size:0x30 lbl_100_data_1C0 = .data:0x000001C0; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_obj_properaNP/symbols.txt b/config/SOUE01/rels/d_a_obj_properaNP/symbols.txt index a8aaee07..ace88560 100644 --- a/config/SOUE01/rels/d_a_obj_properaNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_properaNP/symbols.txt @@ -66,7 +66,7 @@ lbl_575_rodata_14 = .rodata:0x00000014; // type:object size:0x1C data:float lbl_575_rodata_30 = .rodata:0x00000030; // type:object size:0x4 data:float lbl_575_rodata_34 = .rodata:0x00000034; // type:object size:0x4 data:float lbl_575_rodata_38 = .rodata:0x00000038; // type:object size:0x1C data:float -lbl_575_rodata_54 = .rodata:0x00000054; // type:object size:0x4 data:float +s_BH_80ef92b8 = .rodata:0x00000054; // type:object size:0x4 data:float lbl_575_rodata_58 = .rodata:0x00000058; // type:object size:0x4 data:float g_profile_OBJ_PROPERA = .data:0x00000000; // type:object size:0x10 data:4byte lbl_575_data_10 = .data:0x00000010; // type:object size:0xC diff --git a/config/SOUE01/rels/d_a_obj_pumpkin_barNP/symbols.txt b/config/SOUE01/rels/d_a_obj_pumpkin_barNP/symbols.txt index 1b95e14c..7ed586a7 100644 --- a/config/SOUE01/rels/d_a_obj_pumpkin_barNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_pumpkin_barNP/symbols.txt @@ -14,4 +14,4 @@ _dtors = .dtors:0x00000000; // type:label scope:global lbl_391_rodata_0 = .rodata:0x00000000; // type:object size:0x20 data:float g_profile_OBJ_PUMPKIN_BAR = .data:0x00000000; // type:object size:0x60 lbl_391_data_60 = .data:0x00000060; // type:object size:0x20 -lbl_391_data_80 = .data:0x00000080; // type:object size:0x80 +AcOpumpkinBar__vtable = .data:0x00000080; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_push_blockNP/symbols.txt b/config/SOUE01/rels/d_a_obj_push_blockNP/symbols.txt index dfeb9604..de187ca8 100644 --- a/config/SOUE01/rels/d_a_obj_push_blockNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_push_blockNP/symbols.txt @@ -63,7 +63,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global lbl_217_rodata_0 = .rodata:0x00000000; // type:object size:0x24 data:float -lbl_217_rodata_24 = .rodata:0x00000024; // type:object size:0xC data:float +AcOpushBlk__noGravity = .rodata:0x00000024; // type:object size:0xC data:float lbl_217_rodata_30 = .rodata:0x00000030; // type:object size:0x8 data:float lbl_217_rodata_38 = .rodata:0x00000038; // type:object size:0x4 data:float lbl_217_rodata_3C = .rodata:0x0000003C; // type:object size:0x2C data:float @@ -82,8 +82,8 @@ lbl_217_data_F8 = .data:0x000000F8; // type:object size:0x50 lbl_217_data_148 = .data:0x00000148; // type:object size:0x4 data:4byte lbl_217_data_14C = .data:0x0000014C; // type:object size:0x4 data:4byte lbl_217_data_150 = .data:0x00000150; // type:object size:0x8 data:4byte -lbl_217_data_158 = .data:0x00000158; // type:object size:0x80 -lbl_217_data_1D8 = .data:0x000001D8; // type:object size:0x30 +AcOpushBlk__vtable = .data:0x00000158; // type:object size:0x80 +AcOpushBlk__stateMgr_vtable = .data:0x000001D8; // type:object size:0x30 lbl_217_data_208 = .data:0x00000208; // type:object size:0x30 lbl_217_data_238 = .data:0x00000238; // type:object size:0x18 lbl_217_data_250 = .data:0x00000250; // type:object size:0x18 @@ -91,8 +91,8 @@ lbl_217_data_268 = .data:0x00000268; // type:object size:0xD0 lbl_217_data_338 = .data:0x00000338; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_217_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_217_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_217_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_217_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +AcOpushBlk__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOpushBlk__STATE_MOVE = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOpushBlk__STATE_ROPE_GRAB = .bss:0x00000098; // type:object size:0x30 data:4byte lbl_217_bss_C8 = .bss:0x000000C8; // type:object size:0x8 data:byte lbl_217_bss_D0 = .bss:0x000000D0; // type:object size:0x10 data:float diff --git a/config/SOUE01/rels/d_a_obj_puzzle_islandNP/symbols.txt b/config/SOUE01/rels/d_a_obj_puzzle_islandNP/symbols.txt index 8fe23f22..6e30c79a 100644 --- a/config/SOUE01/rels/d_a_obj_puzzle_islandNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_puzzle_islandNP/symbols.txt @@ -14,4 +14,4 @@ _dtors = .dtors:0x00000000; // type:label scope:global lbl_369_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float g_profile_OBJ_PUZZLE_ISLAND = .data:0x00000000; // type:object size:0x38 lbl_369_data_38 = .data:0x00000038; // type:object size:0x20 data:string -lbl_369_data_58 = .data:0x00000058; // type:object size:0x80 +AcOpuzzleIsland__vtable = .data:0x00000058; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_rail_endNP/symbols.txt b/config/SOUE01/rels/d_a_obj_rail_endNP/symbols.txt index 7f003366..66b67a1b 100644 --- a/config/SOUE01/rels/d_a_obj_rail_endNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_rail_endNP/symbols.txt @@ -16,4 +16,4 @@ lbl_525_data_0 = .data:0x00000000; // type:object size:0x30 g_profile_OBJ_RAIL_END = .data:0x00000030; // type:object size:0x10 lbl_525_data_40 = .data:0x00000040; // type:object size:0x8 data:string lbl_525_data_48 = .data:0x00000048; // type:object size:0x20 -lbl_525_data_68 = .data:0x00000068; // type:object size:0x80 +AcORailEnd__vtable = .data:0x00000068; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_rail_postNP/symbols.txt b/config/SOUE01/rels/d_a_obj_rail_postNP/symbols.txt index 271b0c74..818a49f1 100644 --- a/config/SOUE01/rels/d_a_obj_rail_postNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_rail_postNP/symbols.txt @@ -15,4 +15,4 @@ lbl_524_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float g_profile_OBJ_RAIL_POST = .data:0x00000000; // type:object size:0x10 lbl_524_data_10 = .data:0x00000010; // type:object size:0xC lbl_524_data_1C = .data:0x0000001C; // type:object size:0x1C -lbl_524_data_38 = .data:0x00000038; // type:object size:0x80 +AcORailPost__vtable = .data:0x00000038; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_ride_rockNP/symbols.txt b/config/SOUE01/rels/d_a_obj_ride_rockNP/symbols.txt index 6de5c982..d85aa788 100644 --- a/config/SOUE01/rels/d_a_obj_ride_rockNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_ride_rockNP/symbols.txt @@ -119,7 +119,7 @@ lbl_567_rodata_FC = .rodata:0x000000FC; // type:object size:0x58 data:float g_profile_OBJ_RIDE_ROCK = .data:0x00000000; // type:object size:0x10 data:4byte lbl_567_data_10 = .data:0x00000010; // type:object size:0x68 lbl_567_data_78 = .data:0x00000078; // type:object size:0x20 -lbl_567_data_98 = .data:0x00000098; // type:object size:0x80 +AcOrideRock__vtable = .data:0x00000098; // type:object size:0x80 lbl_567_data_118 = .data:0x00000118; // type:object size:0x30 lbl_567_data_148 = .data:0x00000148; // type:object size:0x30 lbl_567_data_178 = .data:0x00000178; // type:object size:0x18 @@ -128,10 +128,10 @@ lbl_567_data_1A8 = .data:0x000001A8; // type:object size:0x16C lbl_567_data_314 = .data:0x00000314; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_567_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_567_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_567_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_567_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_567_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_567_bss_118 = .bss:0x00000118; // type:object size:0x30 data:4byte +AcOrideRock__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOrideRock__STATE_SLOPE = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOrideRock__STATE_SLOPE_WAIT = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOrideRock__STATE_RIDE_MOVE = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOrideRock__STATE_SWITCH_MOVE = .bss:0x00000118; // type:object size:0x30 data:4byte lbl_567_bss_148 = .bss:0x00000148; // type:object size:0x8 data:byte lbl_567_bss_150 = .bss:0x00000150; // type:object size:0x10 data:float diff --git a/config/SOUE01/rels/d_a_obj_rock_boatNP/symbols.txt b/config/SOUE01/rels/d_a_obj_rock_boatNP/symbols.txt index d21150bf..83786e14 100644 --- a/config/SOUE01/rels/d_a_obj_rock_boatNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_rock_boatNP/symbols.txt @@ -82,7 +82,7 @@ g_profile_OBJ_ROCK_BOAT = .data:0x00000030; // type:object size:0x10 lbl_460_data_40 = .data:0x00000040; // type:object size:0x8 data:string lbl_460_data_48 = .data:0x00000048; // type:object size:0x34 lbl_460_data_7C = .data:0x0000007C; // type:object size:0xC -lbl_460_data_88 = .data:0x00000088; // type:object size:0x80 +AcORockBoat__vtable = .data:0x00000088; // type:object size:0x80 lbl_460_data_108 = .data:0x00000108; // type:object size:0x30 lbl_460_data_138 = .data:0x00000138; // type:object size:0x30 lbl_460_data_168 = .data:0x00000168; // type:object size:0x18 @@ -90,8 +90,8 @@ lbl_460_data_180 = .data:0x00000180; // type:object size:0x170 lbl_460_data_2F0 = .data:0x000002F0; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_460_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_460_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_460_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_460_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_460_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_460_bss_118 = .bss:0x00000118; // type:object size:0x30 data:4byte +AcORockBoat__STATE_APPEAR = .bss:0x00000018; // type:object size:0x40 data:4byte +AcORockBoat__STATE_WAIT = .bss:0x00000058; // type:object size:0x40 data:4byte +AcORockBoat__STATE_MOVE = .bss:0x00000098; // type:object size:0x40 data:4byte +AcORockBoat__STATE_PRE_SINK = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcORockBoat__STATE_SINK = .bss:0x00000118; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_rock_dragonNP/symbols.txt b/config/SOUE01/rels/d_a_obj_rock_dragonNP/symbols.txt index 16609d1a..f88e3d06 100644 --- a/config/SOUE01/rels/d_a_obj_rock_dragonNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_rock_dragonNP/symbols.txt @@ -83,7 +83,7 @@ lbl_336_data_C8 = .data:0x000000C8; // type:object size:0x94 lbl_336_data_15C = .data:0x0000015C; // type:object size:0xC lbl_336_data_168 = .data:0x00000168; // type:object size:0x8 lbl_336_data_170 = .data:0x00000170; // type:object size:0x10 -lbl_336_data_180 = .data:0x00000180; // type:object size:0x80 +AcORockDragon__vtable = .data:0x00000180; // type:object size:0x80 lbl_336_data_200 = .data:0x00000200; // type:object size:0x30 lbl_336_data_230 = .data:0x00000230; // type:object size:0x30 lbl_336_data_260 = .data:0x00000260; // type:object size:0x18 @@ -91,7 +91,7 @@ lbl_336_data_278 = .data:0x00000278; // type:object size:0x228 lbl_336_data_4A0 = .data:0x000004A0; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_336_bss_8 = .bss:0x00000008; // type:object size:0x50 data:4byte -lbl_336_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_336_bss_98 = .bss:0x00000098; // type:object size:0x80 data:4byte -lbl_336_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_336_bss_158 = .bss:0x00000158; // type:object size:0x70 data:4byte +AcORockDragon__StateID_Upper_Move = .bss:0x00000058; // type:object size:0x40 data:4byte +AcORockDragon__StateID_Upper_End = .bss:0x00000098; // type:object size:0x80 data:4byte +AcORockDragon__StateID_Lower_RockCatch = .bss:0x00000118; // type:object size:0x40 data:4byte +AcORockDragon__StateID_Lower_End = .bss:0x00000158; // type:object size:0x70 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_rock_skyNP/symbols.txt b/config/SOUE01/rels/d_a_obj_rock_skyNP/symbols.txt index b3ea502e..2d5a7d31 100644 --- a/config/SOUE01/rels/d_a_obj_rock_skyNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_rock_skyNP/symbols.txt @@ -29,5 +29,5 @@ lbl_414_data_A8 = .data:0x000000A8; // type:object size:0x14 lbl_414_data_BC = .data:0x000000BC; // type:object size:0x14 g_profile_OBJ_ROCK_SKY = .data:0x000000D0; // type:object size:0x10 lbl_414_data_E0 = .data:0x000000E0; // type:object size:0x20 -lbl_414_data_100 = .data:0x00000100; // type:object size:0x80 +AcOrockSky__vtable = .data:0x00000100; // type:object size:0x80 lbl_414_bss_8 = .bss:0x00000008; // type:object size:0xC data:float diff --git a/config/SOUE01/rels/d_a_obj_roll_pillarNP/symbols.txt b/config/SOUE01/rels/d_a_obj_roll_pillarNP/symbols.txt index 791c6281..1dbbd65f 100644 --- a/config/SOUE01/rels/d_a_obj_roll_pillarNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_roll_pillarNP/symbols.txt @@ -68,14 +68,14 @@ lbl_322_rodata_20 = .rodata:0x00000020; // type:object size:0x28 data:double g_profile_OBJ_ROLL_PILLAR = .data:0x00000000; // type:object size:0x10 data:4byte lbl_322_data_10 = .data:0x00000010; // type:object size:0x4C lbl_322_data_5C = .data:0x0000005C; // type:object size:0x44 -lbl_322_data_A0 = .data:0x000000A0; // type:object size:0x80 +AcORollPillar__vtable = .data:0x000000A0; // type:object size:0x80 lbl_322_data_120 = .data:0x00000120; // type:object size:0x30 lbl_322_data_150 = .data:0x00000150; // type:object size:0x30 lbl_322_data_180 = .data:0x00000180; // type:object size:0x18 lbl_322_data_198 = .data:0x00000198; // type:object size:0xEC lbl_322_data_284 = .data:0x00000284; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_322_bss_8 = .bss:0x00000008; // type:object size:0x58 data:4byte +AcORollPillar__CornerOffsets = .bss:0x00000008; // type:object size:0x58 data:4byte lbl_322_bss_60 = .bss:0x00000060; // type:object size:0x40 data:4byte lbl_322_bss_A0 = .bss:0x000000A0; // type:object size:0x40 data:4byte lbl_322_bss_E0 = .bss:0x000000E0; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_rotation_lightNP/symbols.txt b/config/SOUE01/rels/d_a_obj_rotation_lightNP/symbols.txt index 4e547ecb..276b3067 100644 --- a/config/SOUE01/rels/d_a_obj_rotation_lightNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_rotation_lightNP/symbols.txt @@ -11,7 +11,7 @@ fn_342_310 = .text:0x00000310; // type:function size:0x28 __dt__19dAcOrotationLight_cFv = .text:0x00000340; // type:function size:0x84 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -lbl_342_rodata_0 = .rodata:0x00000000; // type:object size:0x18 data:float +dAcOrotationLight__AABB = .rodata:0x00000000; // type:object size:0x18 data:float g_profile_OBJ_ROTATION_LIGHT = .data:0x00000000; // type:object size:0x10 lbl_342_data_10 = .data:0x00000010; // type:object size:0x14 lbl_342_data_24 = .data:0x00000024; // type:object size:0x24 diff --git a/config/SOUE01/rels/d_a_obj_rouletteNP/symbols.txt b/config/SOUE01/rels/d_a_obj_rouletteNP/symbols.txt index 327e1b8d..36cdb2e4 100644 --- a/config/SOUE01/rels/d_a_obj_rouletteNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_rouletteNP/symbols.txt @@ -79,7 +79,7 @@ g_profile_OBJ_ROULETTE = .data:0x00000000; // type:object size:0x10 data:4byte lbl_576_data_10 = .data:0x00000010; // type:object size:0x10 lbl_576_data_20 = .data:0x00000020; // type:object size:0x28 lbl_576_data_48 = .data:0x00000048; // type:object size:0x20 -lbl_576_data_68 = .data:0x00000068; // type:object size:0x100 +AcObjRoulette__vtable = .data:0x00000068; // type:object size:0x100 lbl_576_data_168 = .data:0x00000168; // type:object size:0x30 lbl_576_data_198 = .data:0x00000198; // type:object size:0x30 lbl_576_data_1C8 = .data:0x000001C8; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_obj_roulette_island_cNP/symbols.txt b/config/SOUE01/rels/d_a_obj_roulette_island_cNP/symbols.txt index 000f8770..f47b2083 100644 --- a/config/SOUE01/rels/d_a_obj_roulette_island_cNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_roulette_island_cNP/symbols.txt @@ -50,13 +50,13 @@ __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 sc lbl_358_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float g_profile_OBJ_ROULETTE_ISLAND_C = .data:0x00000000; // type:object size:0x54 data:4byte lbl_358_data_54 = .data:0x00000054; // type:object size:0x24 -lbl_358_data_78 = .data:0x00000078; // type:object size:0x80 +AcOrouletteIslandC__vtable = .data:0x00000078; // type:object size:0x80 lbl_358_data_F8 = .data:0x000000F8; // type:object size:0x30 lbl_358_data_128 = .data:0x00000128; // type:object size:0x30 lbl_358_data_158 = .data:0x00000158; // type:object size:0x18 lbl_358_data_170 = .data:0x00000170; // type:object size:0xA8 lbl_358_data_218 = .data:0x00000218; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_358_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_358_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_358_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcOrouletteIslandC__PTR = .bss:0x00000008; // type:object size:0x10 data:4byte +AcOrouletteIslandC__StateID_Wait = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOrouletteIslandC__StateID_Play = .bss:0x00000058; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_roulette_island_rNP/symbols.txt b/config/SOUE01/rels/d_a_obj_roulette_island_rNP/symbols.txt index 020bdccd..0129f97c 100644 --- a/config/SOUE01/rels/d_a_obj_roulette_island_rNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_roulette_island_rNP/symbols.txt @@ -57,13 +57,13 @@ __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 sc lbl_359_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float g_profile_OBJ_ROULETTE_ISLAND_R = .data:0x00000000; // type:object size:0x50 data:4byte lbl_359_data_50 = .data:0x00000050; // type:object size:0x28 -lbl_359_data_78 = .data:0x00000078; // type:object size:0x80 +AcOrouletteIslandR__vtable = .data:0x00000078; // type:object size:0x80 lbl_359_data_F8 = .data:0x000000F8; // type:object size:0x30 lbl_359_data_128 = .data:0x00000128; // type:object size:0x30 lbl_359_data_158 = .data:0x00000158; // type:object size:0x18 lbl_359_data_170 = .data:0x00000170; // type:object size:0x13C lbl_359_data_2AC = .data:0x000002AC; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_359_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_359_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_359_bss_58 = .bss:0x00000058; // type:object size:0xB0 data:4byte +AcOrouletteIslandR__PTR = .bss:0x00000008; // type:object size:0x10 data:4byte +AcOrouletteIslandR__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOrouletteIslandR__STATE_MOVE = .bss:0x00000058; // type:object size:0xB0 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_sand_floorNP/symbols.txt b/config/SOUE01/rels/d_a_obj_sand_floorNP/symbols.txt index 6e9109fa..9617f4c0 100644 --- a/config/SOUE01/rels/d_a_obj_sand_floorNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_sand_floorNP/symbols.txt @@ -65,7 +65,7 @@ lbl_474_data_60 = .data:0x00000060; // type:object size:0xC data:string lbl_474_data_6C = .data:0x0000006C; // type:object size:0x34 lbl_474_data_A0 = .data:0x000000A0; // type:object size:0x14 data:string lbl_474_data_B4 = .data:0x000000B4; // type:object size:0x14 data:string -lbl_474_data_C8 = .data:0x000000C8; // type:object size:0x80 +AcOSandFloor__vtable = .data:0x000000C8; // type:object size:0x80 lbl_474_data_148 = .data:0x00000148; // type:object size:0x30 lbl_474_data_178 = .data:0x00000178; // type:object size:0x30 lbl_474_data_1A8 = .data:0x000001A8; // type:object size:0x18 @@ -73,4 +73,4 @@ lbl_474_data_1C0 = .data:0x000001C0; // type:object size:0x5C lbl_474_data_21C = .data:0x0000021C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_474_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_474_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcOSandFloor__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_sandbagNP/symbols.txt b/config/SOUE01/rels/d_a_obj_sandbagNP/symbols.txt index 7a32ed4a..1def2eab 100644 --- a/config/SOUE01/rels/d_a_obj_sandbagNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_sandbagNP/symbols.txt @@ -62,7 +62,7 @@ g_profile_OBJ_SANDBAG = .data:0x00000030; // type:object size:0x10 lbl_612_data_40 = .data:0x00000040; // type:object size:0x8 lbl_612_data_48 = .data:0x00000048; // type:object size:0x14 lbl_612_data_5C = .data:0x0000005C; // type:object size:0x1C -lbl_612_data_78 = .data:0x00000078; // type:object size:0x80 +AcOSandbag__vtable = .data:0x00000078; // type:object size:0x80 lbl_612_data_F8 = .data:0x000000F8; // type:object size:0x30 lbl_612_data_128 = .data:0x00000128; // type:object size:0x30 lbl_612_data_158 = .data:0x00000158; // type:object size:0x18 @@ -71,4 +71,4 @@ lbl_612_data_188 = .data:0x00000188; // type:object size:0x4C lbl_612_data_1D4 = .data:0x000001D4; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_612_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_612_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcOSandbag__StateID_Wait = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_saveNP/symbols.txt b/config/SOUE01/rels/d_a_obj_saveNP/symbols.txt index d63a29fa..b578cf62 100644 --- a/config/SOUE01/rels/d_a_obj_saveNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_saveNP/symbols.txt @@ -108,7 +108,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global lbl_481_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float -lbl_481_rodata_4 = .rodata:0x00000004; // type:object size:0x24 +SAVE_OBJECT_ARRAY = .rodata:0x00000004; // type:object size:0x24 lbl_481_rodata_28 = .rodata:0x00000028; // type:object size:0x18 data:4byte lbl_481_rodata_40 = .rodata:0x00000040; // type:object size:0xD0 data:4byte lbl_481_rodata_110 = .rodata:0x00000110; // type:object size:0x1C data:float @@ -133,7 +133,7 @@ lbl_481_data_108 = .data:0x00000108; // type:object size:0x10 lbl_481_data_118 = .data:0x00000118; // type:object size:0xC0 lbl_481_data_1D8 = .data:0x000001D8; // type:object size:0x8 lbl_481_data_1E0 = .data:0x000001E0; // type:object size:0x8 -lbl_481_data_1E8 = .data:0x000001E8; // type:object size:0x80 +AcOSave__vtable = .data:0x000001E8; // type:object size:0x80 lbl_481_data_268 = .data:0x00000268; // type:object size:0x30 lbl_481_data_298 = .data:0x00000298; // type:object size:0x30 lbl_481_data_2C8 = .data:0x000002C8; // type:object size:0x18 @@ -149,10 +149,10 @@ lbl_481_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte lbl_481_bss_21 = .bss:0x00000021; // type:object size:0x1 data:byte lbl_481_bss_22 = .bss:0x00000022; // type:object size:0x1 data:byte lbl_481_bss_23 = .bss:0x00000023; // type:object size:0x4D data:byte -lbl_481_bss_70 = .bss:0x00000070; // type:object size:0x40 data:4byte -lbl_481_bss_B0 = .bss:0x000000B0; // type:object size:0x40 data:4byte -lbl_481_bss_F0 = .bss:0x000000F0; // type:object size:0x40 data:4byte -lbl_481_bss_130 = .bss:0x00000130; // type:object size:0x40 data:4byte -lbl_481_bss_170 = .bss:0x00000170; // type:object size:0x40 data:4byte +AcOSave__STATE_SHINE = .bss:0x00000070; // type:object size:0x40 data:4byte +AcOSave__STATE_WAIT = .bss:0x000000B0; // type:object size:0x40 data:4byte +AcOSave__STATE_QUERY = .bss:0x000000F0; // type:object size:0x40 data:4byte +AcOSave__STATE_LIGHTSHAFT = .bss:0x00000130; // type:object size:0x40 data:4byte +AcOSave__STATE_ESCAPE = .bss:0x00000170; // type:object size:0x40 data:4byte lbl_481_bss_1B0 = .bss:0x000001B0; // type:object size:0x8 data:byte lbl_481_bss_1B8 = .bss:0x000001B8; // type:object size:0x10 data:float diff --git a/config/SOUE01/rels/d_a_obj_sea_F301NP/symbols.txt b/config/SOUE01/rels/d_a_obj_sea_F301NP/symbols.txt index 7135bd54..97bb5c30 100644 --- a/config/SOUE01/rels/d_a_obj_sea_F301NP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_sea_F301NP/symbols.txt @@ -47,7 +47,7 @@ g_profile_OBJ_SEA_F301 = .data:0x00000000; // type:object size:0x10 data:4byte lbl_570_data_10 = .data:0x00000010; // type:object size:0x8 lbl_570_data_18 = .data:0x00000018; // type:object size:0x30 lbl_570_data_48 = .data:0x00000048; // type:object size:0x20 -lbl_570_data_68 = .data:0x00000068; // type:object size:0x80 +AcOSeaF301__vtable = .data:0x00000068; // type:object size:0x80 lbl_570_data_E8 = .data:0x000000E8; // type:object size:0x30 lbl_570_data_118 = .data:0x00000118; // type:object size:0x30 lbl_570_data_148 = .data:0x00000148; // type:object size:0x18 @@ -55,4 +55,4 @@ lbl_570_data_160 = .data:0x00000160; // type:object size:0x64 lbl_570_data_1C4 = .data:0x000001C4; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_570_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_570_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcOSeaF301__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_sealed_doorNP/symbols.txt b/config/SOUE01/rels/d_a_obj_sealed_doorNP/symbols.txt index d36540eb..91a94300 100644 --- a/config/SOUE01/rels/d_a_obj_sealed_doorNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_sealed_doorNP/symbols.txt @@ -65,8 +65,8 @@ _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global lbl_395_rodata_0 = .rodata:0x00000000; // type:object size:0x10 data:float -lbl_395_rodata_10 = .rodata:0x00000010; // type:object size:0x10 -lbl_395_rodata_20 = .rodata:0x00000020; // type:object size:0x10 +AcOsealedDoor__OARC = .rodata:0x00000010; // type:object size:0x10 +AcOsealedDoor__MODELS = .rodata:0x00000020; // type:object size:0x10 lbl_395_rodata_30 = .rodata:0x00000030; // type:object size:0x4 data:float lbl_395_rodata_34 = .rodata:0x00000034; // type:object size:0x4 data:float lbl_395_rodata_38 = .rodata:0x00000038; // type:object size:0x4 data:float @@ -87,7 +87,7 @@ lbl_395_data_FC = .data:0x000000FC; // type:object size:0x8 lbl_395_data_104 = .data:0x00000104; // type:object size:0x44 lbl_395_data_148 = .data:0x00000148; // type:object size:0x14 lbl_395_data_15C = .data:0x0000015C; // type:object size:0x14 -lbl_395_data_170 = .data:0x00000170; // type:object size:0x80 +AcOsealedDoor__vtable = .data:0x00000170; // type:object size:0x80 lbl_395_data_1F0 = .data:0x000001F0; // type:object size:0x30 lbl_395_data_220 = .data:0x00000220; // type:object size:0x30 lbl_395_data_250 = .data:0x00000250; // type:object size:0x18 @@ -95,10 +95,10 @@ lbl_395_data_268 = .data:0x00000268; // type:object size:0x1E4 lbl_395_data_44C = .data:0x0000044C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_395_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_395_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_395_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_395_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_395_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_395_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_395_bss_158 = .bss:0x00000158; // type:object size:0x30 data:4byte +AcOsealedDoor__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOsealedDoor__STATE_MARK_APPEAR = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOsealedDoor__STATE_LIGHT = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOsealedDoor__STATE_ANM_WAIT = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOsealedDoor__STATE_VANISH = .bss:0x00000118; // type:object size:0x40 data:4byte +AcOsealedDoor__STATE_APPEAR = .bss:0x00000158; // type:object size:0x30 data:4byte lbl_395_bss_188 = .bss:0x00000188; // type:object size:0x1 data:byte diff --git a/config/SOUE01/rels/d_a_obj_seat_swordNP/symbols.txt b/config/SOUE01/rels/d_a_obj_seat_swordNP/symbols.txt index bc842225..bd71de0f 100644 --- a/config/SOUE01/rels/d_a_obj_seat_swordNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_seat_swordNP/symbols.txt @@ -65,7 +65,7 @@ lbl_499_data_4C = .data:0x0000004C; // type:object size:0xC scope:local SwordSeatNames = .data:0x00000058; // type:object size:0x8 lbl_499_data_60 = .data:0x00000060; // type:object size:0xC scope:local lbl_499_data_6C = .data:0x0000006C; // type:object size:0x20 scope:local -lbl_499_data_8C = .data:0x0000008C; // type:object size:0x4 scope:local data:4byte +someAng = .data:0x0000008C; // type:object size:0x4 scope:local data:4byte __vt__15dAcOSeatSword_c = .data:0x00000090; // type:object size:0x80 __vt__54sFStateMgr_c<15dAcOSeatSword_c,20sStateMethodUsr_FI_c> = .data:0x00000110; // type:object size:0x30 __vt__84sStateMgr_c<15dAcOSeatSword_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x00000140; // type:object size:0x30 diff --git a/config/SOUE01/rels/d_a_obj_shedNP/symbols.txt b/config/SOUE01/rels/d_a_obj_shedNP/symbols.txt index e33f891e..8cee503d 100644 --- a/config/SOUE01/rels/d_a_obj_shedNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_shedNP/symbols.txt @@ -52,7 +52,7 @@ g_profile_OBJ_SHED = .data:0x00000000; // type:object size:0x60 data:4byte lbl_587_data_60 = .data:0x00000060; // type:object size:0x18 data:string lbl_587_data_78 = .data:0x00000078; // type:object size:0x4 data:4byte lbl_587_data_7C = .data:0x0000007C; // type:object size:0x4 data:4byte -lbl_587_data_80 = .data:0x00000080; // type:object size:0x80 +AcOShed__vtable = .data:0x00000080; // type:object size:0x80 lbl_587_data_100 = .data:0x00000100; // type:object size:0x30 lbl_587_data_130 = .data:0x00000130; // type:object size:0x30 lbl_587_data_160 = .data:0x00000160; // type:object size:0x18 @@ -60,5 +60,5 @@ lbl_587_data_178 = .data:0x00000178; // type:object size:0x98 lbl_587_data_210 = .data:0x00000210; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_587_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_587_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_587_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcOShed__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOShed__STATE_MOVE = .bss:0x00000058; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_ship_windowNP/symbols.txt b/config/SOUE01/rels/d_a_obj_ship_windowNP/symbols.txt index a79d80af..929d3143 100644 --- a/config/SOUE01/rels/d_a_obj_ship_windowNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_ship_windowNP/symbols.txt @@ -61,7 +61,7 @@ lbl_389_data_84 = .data:0x00000084; // type:object size:0x4 data:4byte lbl_389_data_88 = .data:0x00000088; // type:object size:0x4 data:4byte lbl_389_data_8C = .data:0x0000008C; // type:object size:0x4 data:4byte lbl_389_data_90 = .data:0x00000090; // type:object size:0x8 data:4byte -lbl_389_data_98 = .data:0x00000098; // type:object size:0x80 +AcOShipWindow__vtable = .data:0x00000098; // type:object size:0x80 lbl_389_data_118 = .data:0x00000118; // type:object size:0x30 lbl_389_data_148 = .data:0x00000148; // type:object size:0x30 lbl_389_data_178 = .data:0x00000178; // type:object size:0x18 @@ -69,6 +69,6 @@ lbl_389_data_190 = .data:0x00000190; // type:object size:0xE8 lbl_389_data_278 = .data:0x00000278; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_389_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_389_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_389_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_389_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +AcOshipWindow__STATE_CLOSE = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOshipWindow__STATE_MOVE = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOshipWindow__STATE_OPEN = .bss:0x00000098; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_shrine_afterNP/symbols.txt b/config/SOUE01/rels/d_a_obj_shrine_afterNP/symbols.txt index efd5c50c..50e7ae0c 100644 --- a/config/SOUE01/rels/d_a_obj_shrine_afterNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_shrine_afterNP/symbols.txt @@ -14,4 +14,4 @@ lbl_387_rodata_0 = .rodata:0x00000000; // type:object size:0x18 data:float g_profile_OBJ_SHRINE_AFTER = .data:0x00000000; // type:object size:0x10 lbl_387_data_10 = .data:0x00000010; // type:object size:0x10 lbl_387_data_20 = .data:0x00000020; // type:object size:0x20 -lbl_387_data_40 = .data:0x00000040; // type:object size:0x80 +AcOshrineAfter__vtable = .data:0x00000040; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_shrine_bef_insideNP/symbols.txt b/config/SOUE01/rels/d_a_obj_shrine_bef_insideNP/symbols.txt index cea0ec7c..a9b25a62 100644 --- a/config/SOUE01/rels/d_a_obj_shrine_bef_insideNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_shrine_bef_insideNP/symbols.txt @@ -10,9 +10,9 @@ AcOshrineBefInside__draw = .text:0x00000320; // type:function size:0x60 __dt__21dAcOshrineBefInside_cFv = .text:0x00000380; // type:function size:0x80 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -lbl_418_rodata_0 = .rodata:0x00000000; // type:object size:0x20 data:float +AcOshrineBefInside__MODELS = .rodata:0x00000000; // type:object size:0x20 data:float lbl_418_data_0 = .data:0x00000000; // type:object size:0x10 lbl_418_data_10 = .data:0x00000010; // type:object size:0x10 g_profile_OBJ_SHRINE_BEF_INSIDE = .data:0x00000020; // type:object size:0x50 lbl_418_data_70 = .data:0x00000070; // type:object size:0x28 -lbl_418_data_98 = .data:0x00000098; // type:object size:0x80 +AcOshrineBefInside__vtable = .data:0x00000098; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_shrine_beforeNP/symbols.txt b/config/SOUE01/rels/d_a_obj_shrine_beforeNP/symbols.txt index 4373c07b..8a948eb5 100644 --- a/config/SOUE01/rels/d_a_obj_shrine_beforeNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_shrine_beforeNP/symbols.txt @@ -14,4 +14,4 @@ lbl_388_rodata_0 = .rodata:0x00000000; // type:object size:0x1C data:float g_profile_OBJ_SHRINE_BEFORE = .data:0x00000000; // type:object size:0x10 lbl_388_data_10 = .data:0x00000010; // type:object size:0x10 lbl_388_data_20 = .data:0x00000020; // type:object size:0x20 data:string -lbl_388_data_40 = .data:0x00000040; // type:object size:0x80 +AcOshrineBefore__vtable = .data:0x00000040; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_shutterNP/symbols.txt b/config/SOUE01/rels/d_a_obj_shutterNP/symbols.txt index f07c4532..cd96372e 100644 --- a/config/SOUE01/rels/d_a_obj_shutterNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_shutterNP/symbols.txt @@ -174,7 +174,7 @@ lbl_606_data_1BC = .data:0x000001BC; // type:object size:0x4 data:4byte lbl_606_data_1C0 = .data:0x000001C0; // type:object size:0x18 data:4byte lbl_606_data_1D8 = .data:0x000001D8; // type:object size:0x4 data:4byte lbl_606_data_1DC = .data:0x000001DC; // type:object size:0x4 data:4byte -lbl_606_data_1E0 = .data:0x000001E0; // type:object size:0x90 +AcOShutter__vtable = .data:0x000001E0; // type:object size:0x90 lbl_606_data_270 = .data:0x00000270; // type:object size:0x30 lbl_606_data_2A0 = .data:0x000002A0; // type:object size:0x30 lbl_606_data_2D0 = .data:0x000002D0; // type:object size:0x18 @@ -188,5 +188,5 @@ lbl_606_bss_44 = .bss:0x00000044; // type:object size:0xC data:float lbl_606_bss_50 = .bss:0x00000050; // type:object size:0x10 data:float lbl_606_bss_60 = .bss:0x00000060; // type:object size:0x18 lbl_606_bss_78 = .bss:0x00000078; // type:object size:0x10 data:4byte -lbl_606_bss_88 = .bss:0x00000088; // type:object size:0x40 data:4byte -lbl_606_bss_C8 = .bss:0x000000C8; // type:object size:0x80 data:4byte +AcOShutter__StateID_Wait = .bss:0x00000088; // type:object size:0x40 data:4byte +AcOShutter__StateID_Open = .bss:0x000000C8; // type:object size:0x80 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_shutter_fenceNP/symbols.txt b/config/SOUE01/rels/d_a_obj_shutter_fenceNP/symbols.txt index 4ba6d554..e679d8b6 100644 --- a/config/SOUE01/rels/d_a_obj_shutter_fenceNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_shutter_fenceNP/symbols.txt @@ -63,7 +63,7 @@ lbl_275_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 data:float lbl_275_rodata_20 = .rodata:0x00000020; // type:object size:0x4 data:float g_profile_OBJ_SHUTTER_FENCE = .data:0x00000000; // type:object size:0x50 data:4byte lbl_275_data_50 = .data:0x00000050; // type:object size:0xB0 -lbl_275_data_100 = .data:0x00000100; // type:object size:0x80 +AcOshutterfence__vtable = .data:0x00000100; // type:object size:0x80 lbl_275_data_180 = .data:0x00000180; // type:object size:0x30 lbl_275_data_1B0 = .data:0x000001B0; // type:object size:0x30 lbl_275_data_1E0 = .data:0x000001E0; // type:object size:0x18 @@ -72,5 +72,5 @@ lbl_275_data_210 = .data:0x00000210; // type:object size:0xA8 lbl_275_data_2B8 = .data:0x000002B8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_275_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_275_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_275_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcOshutterfence__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOshutterfence__STATE_OPEN = .bss:0x00000058; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_side_shutterNP/symbols.txt b/config/SOUE01/rels/d_a_obj_side_shutterNP/symbols.txt index b3c62e59..28a6255f 100644 --- a/config/SOUE01/rels/d_a_obj_side_shutterNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_side_shutterNP/symbols.txt @@ -77,7 +77,7 @@ lbl_345_data_CC = .data:0x000000CC; // type:object size:0x4 data:4byte lbl_345_data_D0 = .data:0x000000D0; // type:object size:0x4 data:4byte lbl_345_data_D4 = .data:0x000000D4; // type:object size:0x4 data:4byte lbl_345_data_D8 = .data:0x000000D8; // type:object size:0x8 data:4byte -lbl_345_data_E0 = .data:0x000000E0; // type:object size:0x80 +AcOsideShutter__vtable = .data:0x000000E0; // type:object size:0x80 lbl_345_data_160 = .data:0x00000160; // type:object size:0x30 lbl_345_data_190 = .data:0x00000190; // type:object size:0x30 lbl_345_data_1C0 = .data:0x000001C0; // type:object size:0x18 @@ -85,9 +85,9 @@ lbl_345_data_1D8 = .data:0x000001D8; // type:object size:0x1E8 lbl_345_data_3C0 = .data:0x000003C0; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_345_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_345_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_345_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_345_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_345_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_345_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_345_bss_158 = .bss:0x00000158; // type:object size:0x30 data:4byte +AcOsideShutter__STATE_OFF = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOsideShutter__STATE_ON = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOsideShutter__STATE_OFF_TO_ON_WAIT = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOsideShutter__STATE_OFF_TO_ON = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOsideShutter__STATE_ON_TO_OFF_WAIT = .bss:0x00000118; // type:object size:0x40 data:4byte +AcOsideShutter__STATE_ON_TO_OFF = .bss:0x00000158; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_sink_floor_fNP/symbols.txt b/config/SOUE01/rels/d_a_obj_sink_floor_fNP/symbols.txt index f0adc952..c25eeff7 100644 --- a/config/SOUE01/rels/d_a_obj_sink_floor_fNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_sink_floor_fNP/symbols.txt @@ -79,7 +79,7 @@ __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 sc lbl_282_rodata_0 = .rodata:0x00000000; // type:object size:0x14 data:float lbl_282_rodata_14 = .rodata:0x00000014; // type:object size:0x34 lbl_282_rodata_48 = .rodata:0x00000048; // type:object size:0x8 data:float -lbl_282_rodata_50 = .rodata:0x00000050; // type:object size:0x30 +AcOSinkFloorF__MODEL_DZB_PLC = .rodata:0x00000050; // type:object size:0x30 lbl_282_rodata_80 = .rodata:0x00000080; // type:object size:0x8 data:float lbl_282_rodata_88 = .rodata:0x00000088; // type:object size:0x14 data:float lbl_282_rodata_9C = .rodata:0x0000009C; // type:object size:0x4 data:float @@ -112,7 +112,7 @@ lbl_282_data_F8 = .data:0x000000F8; // type:object size:0x30 lbl_282_data_128 = .data:0x00000128; // type:object size:0x4 lbl_282_data_12C = .data:0x0000012C; // type:object size:0x4 lbl_282_data_130 = .data:0x00000130; // type:object size:0x8 -lbl_282_data_138 = .data:0x00000138; // type:object size:0x80 +AcOSinkFloorF__vtable = .data:0x00000138; // type:object size:0x80 lbl_282_data_1B8 = .data:0x000001B8; // type:object size:0x30 lbl_282_data_1E8 = .data:0x000001E8; // type:object size:0x30 lbl_282_data_218 = .data:0x00000218; // type:object size:0x18 @@ -120,8 +120,8 @@ lbl_282_data_230 = .data:0x00000230; // type:object size:0xE4 lbl_282_data_314 = .data:0x00000314; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_282_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_282_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_282_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_282_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +AcOSinkFloorF__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOSinkFloorF__STATE_RIDE = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOSinkFloorF__STATE_SINK = .bss:0x00000098; // type:object size:0x30 data:4byte lbl_282_bss_C8 = .bss:0x000000C8; // type:object size:0x4 data:float lbl_282_bss_CC = .bss:0x000000CC; // type:object size:0x1 data:byte diff --git a/config/SOUE01/rels/d_a_obj_smokeNP/symbols.txt b/config/SOUE01/rels/d_a_obj_smokeNP/symbols.txt index 7be9f140..4379cb03 100644 --- a/config/SOUE01/rels/d_a_obj_smokeNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_smokeNP/symbols.txt @@ -40,20 +40,20 @@ isSameName__26sFStateID_c<11dAcOsmoke_c>CFPCc = .text:0x00000B00; // type:functi _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global -lbl_373_rodata_0 = .rodata:0x00000000; // type:object size:0x8 scope:local -lbl_373_rodata_8 = .rodata:0x00000008; // type:object size:0x8 scope:local +sSmokeNames1 = .rodata:0x00000000; // type:object size:0x8 scope:local +sSmokeNames2 = .rodata:0x00000008; // type:object size:0x8 scope:local lbl_373_rodata_10 = .rodata:0x00000010; // type:object size:0x4 scope:local data:float lbl_373_rodata_14 = .rodata:0x00000014; // type:object size:0x4 scope:local data:float lbl_373_data_0 = .data:0x00000000; // type:object size:0xC scope:local data:4byte lbl_373_data_C = .data:0x0000000C; // type:object size:0xC scope:local g_profile_OBJ_SMOKE = .data:0x00000018; // type:object size:0x10 lbl_373_data_28 = .data:0x00000028; // type:object size:0x20 scope:local -lbl_373_data_48 = .data:0x00000048; // type:object size:0x80 scope:local -lbl_373_data_C8 = .data:0x000000C8; // type:object size:0x30 scope:local -lbl_373_data_F8 = .data:0x000000F8; // type:object size:0x30 scope:local -lbl_373_data_128 = .data:0x00000128; // type:object size:0x18 scope:local -lbl_373_data_140 = .data:0x00000140; // type:object size:0x58 scope:local -lbl_373_data_198 = .data:0x00000198; // type:object size:0x34 scope:local +dAcOsmoke_c____vtable = .data:0x00000048; // type:object size:0x80 scope:local +sFStateMgr_c____vtable = .data:0x000000C8; // type:object size:0x30 scope:local +sStateMgr_c____vtable = .data:0x000000F8; // type:object size:0x30 scope:local +sFStateFct_c____vtable = .data:0x00000128; // type:object size:0x18 scope:local +sFState_c____vtable = .data:0x00000140; // type:object size:0x58 scope:local +sFStateID_c____vtable = .data:0x00000198; // type:object size:0x34 scope:local __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_373_bss_8 = .bss:0x00000008; // type:object size:0x10 scope:local StateID_Wait__11dAcOsmoke_c = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_soilNP/symbols.txt b/config/SOUE01/rels/d_a_obj_soilNP/symbols.txt index abd078df..2287cbfc 100644 --- a/config/SOUE01/rels/d_a_obj_soilNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_soilNP/symbols.txt @@ -73,7 +73,7 @@ lbl_255_data_4C = .data:0x0000004C; // type:object size:0x5C lbl_255_data_A8 = .data:0x000000A8; // type:object size:0x8 lbl_255_data_B0 = .data:0x000000B0; // type:object size:0x10 lbl_255_data_C0 = .data:0x000000C0; // type:object size:0x10 data:string -lbl_255_data_D0 = .data:0x000000D0; // type:object size:0x80 +AcOSoil__vtable = .data:0x000000D0; // type:object size:0x80 lbl_255_data_150 = .data:0x00000150; // type:object size:0x30 lbl_255_data_180 = .data:0x00000180; // type:object size:0x30 lbl_255_data_1B0 = .data:0x000001B0; // type:object size:0x18 @@ -81,9 +81,9 @@ lbl_255_data_1C8 = .data:0x000001C8; // type:object size:0xD8 lbl_255_data_2A0 = .data:0x000002A0; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_255_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_255_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_255_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_255_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +AcOSoil__StateID_Soil = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOSoil__StateID_Hole = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOSoil__StateID_Ready = .bss:0x00000098; // type:object size:0x30 data:4byte lbl_255_bss_C8 = .bss:0x000000C8; // type:object size:0x1 data:byte lbl_255_bss_CC = .bss:0x000000CC; // type:object size:0xC data:float lbl_255_bss_D8 = .bss:0x000000D8; // type:object size:0x1 data:byte diff --git a/config/SOUE01/rels/d_a_obj_spider_lineNP/symbols.txt b/config/SOUE01/rels/d_a_obj_spider_lineNP/symbols.txt index 7297117f..01532fe0 100644 --- a/config/SOUE01/rels/d_a_obj_spider_lineNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_spider_lineNP/symbols.txt @@ -77,7 +77,7 @@ isSameName__31sFStateID_c<16dObjSpiderLine_c>CFPCc = .text:0x00005C30; // type:f _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global -lbl_159_rodata_0 = .rodata:0x00000000; // type:object size:0x44 data:float +ObjSpiderLine__colliderInit = .rodata:0x00000000; // type:object size:0x44 data:float lbl_159_rodata_44 = .rodata:0x00000044; // type:object size:0x4 data:float lbl_159_rodata_48 = .rodata:0x00000048; // type:object size:0x4 data:float lbl_159_rodata_50 = .rodata:0x00000050; // type:object size:0x14 @@ -91,7 +91,7 @@ g_profile_OBJ_SPIDER_LINE = .data:0x00000070; // type:object size:0x10 lbl_159_data_80 = .data:0x00000080; // type:object size:0x8 data:4byte lbl_159_data_88 = .data:0x00000088; // type:object size:0x10 data:string lbl_159_data_98 = .data:0x00000098; // type:object size:0x38 -lbl_159_data_D0 = .data:0x000000D0; // type:object size:0x80 +ObjSpiderLine__vtable = .data:0x000000D0; // type:object size:0x80 lbl_159_data_150 = .data:0x00000150; // type:object size:0x30 lbl_159_data_180 = .data:0x00000180; // type:object size:0x30 lbl_159_data_1B0 = .data:0x000001B0; // type:object size:0x18 @@ -99,4 +99,4 @@ lbl_159_data_1C8 = .data:0x000001C8; // type:object size:0x5C lbl_159_data_224 = .data:0x00000224; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_159_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_159_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +ObjSpiderLine__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_stage_crackNP/symbols.txt b/config/SOUE01/rels/d_a_obj_stage_crackNP/symbols.txt index dc6d8225..a7e01049 100644 --- a/config/SOUE01/rels/d_a_obj_stage_crackNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_stage_crackNP/symbols.txt @@ -63,7 +63,7 @@ lbl_378_rodata_28 = .rodata:0x00000028; // type:object size:0x4 data:float lbl_378_rodata_2C = .rodata:0x0000002C; // type:object size:0x1C data:float g_profile_OBJ_STAGE_CRACK = .data:0x00000000; // type:object size:0x74 data:4byte lbl_378_data_74 = .data:0x00000074; // type:object size:0x24 -lbl_378_data_98 = .data:0x00000098; // type:object size:0x80 +AcOstageCrack__vtable = .data:0x00000098; // type:object size:0x80 lbl_378_data_118 = .data:0x00000118; // type:object size:0x30 lbl_378_data_148 = .data:0x00000148; // type:object size:0x30 lbl_378_data_178 = .data:0x00000178; // type:object size:0x18 @@ -71,7 +71,7 @@ lbl_378_data_190 = .data:0x00000190; // type:object size:0x130 lbl_378_data_2C0 = .data:0x000002C0; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_378_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_378_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_378_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_378_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_378_bss_D8 = .bss:0x000000D8; // type:object size:0x30 data:4byte +AcOstageCrack__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOstageCrack__STATE_STAY = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOstageCrack__STATE_REVERSE = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOstageCrack__STATE_DELETE = .bss:0x000000D8; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_stage_krakenNP/symbols.txt b/config/SOUE01/rels/d_a_obj_stage_krakenNP/symbols.txt index 5b3d87d6..875abbf6 100644 --- a/config/SOUE01/rels/d_a_obj_stage_krakenNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_stage_krakenNP/symbols.txt @@ -106,15 +106,15 @@ lbl_346_data_180 = .data:0x00000180; // type:object size:0x10 lbl_346_data_190 = .data:0x00000190; // type:object size:0x4C lbl_346_data_1DC = .data:0x000001DC; // type:object size:0x20 jumptable_346_data_1FC = .data:0x000001FC; // type:object size:0x28 scope:local -lbl_346_data_228 = .data:0x00000228; // type:object size:0x80 -lbl_346_data_2A8 = .data:0x000002A8; // type:object size:0x30 +AcOStageKraken__vtable = .data:0x00000228; // type:object size:0x80 +AcOStageKraken__stateMgr_vtable = .data:0x000002A8; // type:object size:0x30 lbl_346_data_2D8 = .data:0x000002D8; // type:object size:0x30 lbl_346_data_308 = .data:0x00000308; // type:object size:0x18 lbl_346_data_320 = .data:0x00000320; // type:object size:0x164 lbl_346_data_484 = .data:0x00000484; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_346_bss_8 = .bss:0x00000008; // type:object size:0x50 data:float -lbl_346_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_346_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_346_bss_D8 = .bss:0x000000D8; // type:object size:0x30 data:4byte -lbl_346_bss_108 = .bss:0x00000108; // type:object size:0x10 data:4byte +AcOStageKraken__STATE_MARK_LIGHT = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOStageKraken__STATE_AROUND_MARK_LIGHT = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOStageKraken__STATE_MARK_VANISH = .bss:0x000000D8; // type:object size:0x30 data:4byte +STAGE_KRAKEN = .bss:0x00000108; // type:object size:0x10 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_stage_kraken_partsNP/symbols.txt b/config/SOUE01/rels/d_a_obj_stage_kraken_partsNP/symbols.txt index dcba973e..284f1036 100644 --- a/config/SOUE01/rels/d_a_obj_stage_kraken_partsNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_stage_kraken_partsNP/symbols.txt @@ -82,14 +82,14 @@ lbl_347_data_180 = .data:0x00000180; // type:object size:0x10 lbl_347_data_190 = .data:0x00000190; // type:object size:0x10 lbl_347_data_1A0 = .data:0x000001A0; // type:object size:0xA0 jumptable_347_data_240 = .data:0x00000240; // type:object size:0x24 scope:local -lbl_347_data_268 = .data:0x00000268; // type:object size:0x80 -lbl_347_data_2E8 = .data:0x000002E8; // type:object size:0x30 -lbl_347_data_318 = .data:0x00000318; // type:object size:0x30 +AcOstageKrakenParts__vtable = .data:0x00000268; // type:object size:0x80 +AcOstageKrakenParts__stateMgr_vtable = .data:0x000002E8; // type:object size:0x30 +AcOstageKrakenParts__base_tab = .data:0x00000318; // type:object size:0x30 lbl_347_data_348 = .data:0x00000348; // type:object size:0x18 lbl_347_data_360 = .data:0x00000360; // type:object size:0xB0 lbl_347_data_410 = .data:0x00000410; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_347_bss_8 = .bss:0x00000008; // type:object size:0x10 data:float -lbl_347_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_347_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcOstageKrakenParts__STATE_SHAKE = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOstageKrakenParts__STATE_FALL = .bss:0x00000058; // type:object size:0x30 data:4byte lbl_347_bss_88 = .bss:0x00000088; // type:object size:0xC data:float diff --git a/config/SOUE01/rels/d_a_obj_stage_sinkNP/symbols.txt b/config/SOUE01/rels/d_a_obj_stage_sinkNP/symbols.txt index f3cbe905..666ca692 100644 --- a/config/SOUE01/rels/d_a_obj_stage_sinkNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_stage_sinkNP/symbols.txt @@ -59,7 +59,7 @@ g_profile_OBJ_STAGE_SINK = .data:0x00000000; // type:object size:0x10 data:4byte lbl_383_data_10 = .data:0x00000010; // type:object size:0x4 data:4byte lbl_383_data_14 = .data:0x00000014; // type:object size:0x48 data:4byte lbl_383_data_5C = .data:0x0000005C; // type:object size:0x24 -lbl_383_data_80 = .data:0x00000080; // type:object size:0x80 +AcOstageSink__vtable = .data:0x00000080; // type:object size:0x80 lbl_383_data_100 = .data:0x00000100; // type:object size:0x30 lbl_383_data_130 = .data:0x00000130; // type:object size:0x30 lbl_383_data_160 = .data:0x00000160; // type:object size:0x18 @@ -67,6 +67,6 @@ lbl_383_data_178 = .data:0x00000178; // type:object size:0xA0 lbl_383_data_218 = .data:0x00000218; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_383_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_383_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_383_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte -lbl_383_bss_88 = .bss:0x00000088; // type:object size:0x4 data:4byte +AcOstageSink__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOstageSink__STATE_MOVE = .bss:0x00000058; // type:object size:0x30 data:4byte +STAGE_SINK_PTR = .bss:0x00000088; // type:object size:0x4 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_stage_waterNP/symbols.txt b/config/SOUE01/rels/d_a_obj_stage_waterNP/symbols.txt index 70e53b5f..e5b316c6 100644 --- a/config/SOUE01/rels/d_a_obj_stage_waterNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_stage_waterNP/symbols.txt @@ -56,7 +56,7 @@ g_profile_OBJ_STAGE_WATER = .data:0x00000000; // type:object size:0x10 data:4byt lbl_384_data_10 = .data:0x00000010; // type:object size:0xC lbl_384_data_1C = .data:0x0000001C; // type:object size:0x44 lbl_384_data_60 = .data:0x00000060; // type:object size:0x20 -lbl_384_data_80 = .data:0x00000080; // type:object size:0x80 +AcOstageWater__vtable = .data:0x00000080; // type:object size:0x80 lbl_384_data_100 = .data:0x00000100; // type:object size:0x30 lbl_384_data_130 = .data:0x00000130; // type:object size:0x30 lbl_384_data_160 = .data:0x00000160; // type:object size:0x18 @@ -64,6 +64,6 @@ lbl_384_data_178 = .data:0x00000178; // type:object size:0xAC lbl_384_data_224 = .data:0x00000224; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_384_bss_8 = .bss:0x00000008; // type:object size:0x10 data:float -lbl_384_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_384_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte -lbl_384_bss_88 = .bss:0x00000088; // type:object size:0x1C data:4byte +AcOstageWater__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOstageWater__STATE_MOVE = .bss:0x00000058; // type:object size:0x30 data:4byte +STAGE_WATER_PTR = .bss:0x00000088; // type:object size:0x1C data:4byte diff --git a/config/SOUE01/rels/d_a_obj_step_gumarmNP/symbols.txt b/config/SOUE01/rels/d_a_obj_step_gumarmNP/symbols.txt index 59b86745..eacd32f5 100644 --- a/config/SOUE01/rels/d_a_obj_step_gumarmNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_step_gumarmNP/symbols.txt @@ -47,7 +47,7 @@ lbl_486_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 data:float lbl_486_data_0 = .data:0x00000000; // type:object size:0x40 data:4byte g_profile_OBJ_STEP_GUMARM = .data:0x00000040; // type:object size:0x44 lbl_486_data_84 = .data:0x00000084; // type:object size:0x24 -lbl_486_data_A8 = .data:0x000000A8; // type:object size:0x80 +AcOStepGumarm__vtable = .data:0x000000A8; // type:object size:0x80 lbl_486_data_128 = .data:0x00000128; // type:object size:0x30 lbl_486_data_158 = .data:0x00000158; // type:object size:0x30 lbl_486_data_188 = .data:0x00000188; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_obj_step_statueNP/symbols.txt b/config/SOUE01/rels/d_a_obj_step_statueNP/symbols.txt index 0b76fe01..4246a8b6 100644 --- a/config/SOUE01/rels/d_a_obj_step_statueNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_step_statueNP/symbols.txt @@ -88,7 +88,7 @@ lbl_493_data_120 = .data:0x00000120; // type:object size:0x1C data:4byte lbl_493_data_13C = .data:0x0000013C; // type:object size:0x4 data:4byte lbl_493_data_140 = .data:0x00000140; // type:object size:0x4 data:4byte lbl_493_data_144 = .data:0x00000144; // type:object size:0x1C -lbl_493_data_160 = .data:0x00000160; // type:object size:0x80 +AcOStepStatue__vtable = .data:0x00000160; // type:object size:0x80 lbl_493_data_1E0 = .data:0x000001E0; // type:object size:0x30 lbl_493_data_210 = .data:0x00000210; // type:object size:0x30 lbl_493_data_240 = .data:0x00000240; // type:object size:0x18 @@ -96,8 +96,8 @@ lbl_493_data_258 = .data:0x00000258; // type:object size:0x178 lbl_493_data_3D0 = .data:0x000003D0; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_493_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_493_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_493_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_493_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_493_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_493_bss_118 = .bss:0x00000118; // type:object size:0x30 data:4byte +AcOStepStatue__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOStepStatue__STATE_CARRY_BOMB = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOStepStatue__STATE_BREAK_DOWN = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOStepStatue__STATE_SAND_SINK = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOStepStatue__STATE_END = .bss:0x00000118; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_step_time_slipNP/symbols.txt b/config/SOUE01/rels/d_a_obj_step_time_slipNP/symbols.txt index f3000367..8a35d22a 100644 --- a/config/SOUE01/rels/d_a_obj_step_time_slipNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_step_time_slipNP/symbols.txt @@ -49,7 +49,7 @@ lbl_291_data_10 = .data:0x00000010; // type:object size:0xC lbl_291_data_1C = .data:0x0000001C; // type:object size:0x10 lbl_291_data_2C = .data:0x0000002C; // type:object size:0x3C lbl_291_data_68 = .data:0x00000068; // type:object size:0x20 data:string -lbl_291_data_88 = .data:0x00000088; // type:object size:0x80 +AcOStepTimeSlip__vtable = .data:0x00000088; // type:object size:0x80 lbl_291_data_108 = .data:0x00000108; // type:object size:0x30 lbl_291_data_138 = .data:0x00000138; // type:object size:0x30 lbl_291_data_168 = .data:0x00000168; // type:object size:0x18 @@ -57,6 +57,6 @@ lbl_291_data_180 = .data:0x00000180; // type:object size:0x60 lbl_291_data_1E0 = .data:0x000001E0; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_291_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_291_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcOStepTimeSlip__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte lbl_291_bss_48 = .bss:0x00000048; // type:object size:0x8 data:byte lbl_291_bss_50 = .bss:0x00000050; // type:object size:0x18 data:float diff --git a/config/SOUE01/rels/d_a_obj_stone_standNP/symbols.txt b/config/SOUE01/rels/d_a_obj_stone_standNP/symbols.txt index d8ea384a..8d3e3c2c 100644 --- a/config/SOUE01/rels/d_a_obj_stone_standNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_stone_standNP/symbols.txt @@ -64,7 +64,7 @@ lbl_513_data_30 = .data:0x00000030; // type:object size:0x1C lbl_513_data_4C = .data:0x0000004C; // type:object size:0x98 lbl_513_data_E4 = .data:0x000000E4; // type:object size:0x18 lbl_513_data_FC = .data:0x000000FC; // type:object size:0x20 -lbl_513_data_11C = .data:0x0000011C; // type:object size:0x8C +AcOStoneStand__vtable = .data:0x0000011C; // type:object size:0x8C lbl_513_data_1A8 = .data:0x000001A8; // type:object size:0x30 lbl_513_data_1D8 = .data:0x000001D8; // type:object size:0x30 lbl_513_data_208 = .data:0x00000208; // type:object size:0x18 @@ -72,5 +72,5 @@ lbl_513_data_220 = .data:0x00000220; // type:object size:0xEC lbl_513_data_30C = .data:0x0000030C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_513_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_513_bss_18 = .bss:0x00000018; // type:object size:0x80 data:4byte -lbl_513_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +AcOStoneStand__StateID_Wait = .bss:0x00000018; // type:object size:0x80 data:4byte +AcOStoneStand__StateID_OnSwitch = .bss:0x00000098; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_stopper_rockNP/symbols.txt b/config/SOUE01/rels/d_a_obj_stopper_rockNP/symbols.txt index e8386678..cd59cf10 100644 --- a/config/SOUE01/rels/d_a_obj_stopper_rockNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_stopper_rockNP/symbols.txt @@ -67,12 +67,12 @@ lbl_262_data_6C = .data:0x0000006C; // type:object size:0xC lbl_262_data_78 = .data:0x00000078; // type:object size:0xC lbl_262_data_84 = .data:0x00000084; // type:object size:0xC lbl_262_data_90 = .data:0x00000090; // type:object size:0x10 -lbl_262_data_A0 = .data:0x000000A0; // type:object size:0x10 +AcOstopperRock__MODELS = .data:0x000000A0; // type:object size:0x10 lbl_262_data_B0 = .data:0x000000B0; // type:object size:0x14 lbl_262_data_C4 = .data:0x000000C4; // type:object size:0x1C lbl_262_data_E0 = .data:0x000000E0; // type:object size:0x14 lbl_262_data_F4 = .data:0x000000F4; // type:object size:0x1C -lbl_262_data_110 = .data:0x00000110; // type:object size:0x80 +AcOstopperRock__vtable = .data:0x00000110; // type:object size:0x80 lbl_262_data_190 = .data:0x00000190; // type:object size:0x30 lbl_262_data_1C0 = .data:0x000001C0; // type:object size:0x30 lbl_262_data_1F0 = .data:0x000001F0; // type:object size:0x18 @@ -80,5 +80,5 @@ lbl_262_data_208 = .data:0x00000208; // type:object size:0xA0 lbl_262_data_2A8 = .data:0x000002A8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_262_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_262_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_262_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcOstopperRock__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOstopperRock__STATE_BOMB = .bss:0x00000058; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_stream_lavaNP/symbols.txt b/config/SOUE01/rels/d_a_obj_stream_lavaNP/symbols.txt index eabeca79..0e7a7bcc 100644 --- a/config/SOUE01/rels/d_a_obj_stream_lavaNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_stream_lavaNP/symbols.txt @@ -74,7 +74,7 @@ lbl_405_data_178 = .data:0x00000178; // type:object size:0x20 lbl_405_data_198 = .data:0x00000198; // type:object size:0x4 data:4byte lbl_405_data_19C = .data:0x0000019C; // type:object size:0x4 data:4byte lbl_405_data_1A0 = .data:0x000001A0; // type:object size:0x8 -lbl_405_data_1A8 = .data:0x000001A8; // type:object size:0x80 +AcOstreamLava__vtable = .data:0x000001A8; // type:object size:0x80 lbl_405_data_228 = .data:0x00000228; // type:object size:0x30 lbl_405_data_258 = .data:0x00000258; // type:object size:0x30 lbl_405_data_288 = .data:0x00000288; // type:object size:0x18 @@ -82,5 +82,5 @@ lbl_405_data_2A0 = .data:0x000002A0; // type:object size:0xC4 lbl_405_data_364 = .data:0x00000364; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_405_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_405_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_405_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcOstreamLava__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOstreamLava__STATE_STREAM = .bss:0x00000058; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_sw_bankNP/symbols.txt b/config/SOUE01/rels/d_a_obj_sw_bankNP/symbols.txt index ba9d3037..1f05e55a 100644 --- a/config/SOUE01/rels/d_a_obj_sw_bankNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_sw_bankNP/symbols.txt @@ -86,7 +86,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global lbl_278_rodata_0 = .rodata:0x00000000; // type:object size:0x8 data:float -lbl_278_rodata_8 = .rodata:0x00000008; // type:object size:0x10 +s_SwitchDial_80caac74 = .rodata:0x00000008; // type:object size:0x10 lbl_278_rodata_18 = .rodata:0x00000018; // type:object size:0x10 data:float lbl_278_rodata_28 = .rodata:0x00000028; // type:object size:0x28 data:float lbl_278_rodata_50 = .rodata:0x00000050; // type:object size:0x1C data:float @@ -97,7 +97,7 @@ g_profile_OBJ_SW_BANK = .data:0x00000008; // type:object size:0x10 lbl_278_data_18 = .data:0x00000018; // type:object size:0x2C lbl_278_data_44 = .data:0x00000044; // type:object size:0xC lbl_278_data_50 = .data:0x00000050; // type:object size:0x18 -lbl_278_data_68 = .data:0x00000068; // type:object size:0xC data:string +s_SwitchDialA_80caad94 = .data:0x00000068; // type:object size:0xC data:string lbl_278_data_74 = .data:0x00000074; // type:object size:0xC data:string lbl_278_data_80 = .data:0x00000080; // type:object size:0xC data:string lbl_278_data_8C = .data:0x0000008C; // type:object size:0xC data:string @@ -108,10 +108,10 @@ lbl_278_data_C8 = .data:0x000000C8; // type:object size:0x30 lbl_278_data_F8 = .data:0x000000F8; // type:object size:0x8 lbl_278_data_100 = .data:0x00000100; // type:object size:0x8 lbl_278_data_108 = .data:0x00000108; // type:object size:0x18 -lbl_278_data_120 = .data:0x00000120; // type:object size:0x8 +s_WaterN_80caae4c = .data:0x00000120; // type:object size:0x8 lbl_278_data_128 = .data:0x00000128; // type:object size:0x8 lbl_278_data_130 = .data:0x00000130; // type:object size:0x18 -lbl_278_data_148 = .data:0x00000148; // type:object size:0x18 +s_dzb/SwitchDesertL.dzb_80caae74 = .data:0x00000148; // type:object size:0x18 lbl_278_data_160 = .data:0x00000160; // type:object size:0x18 lbl_278_data_178 = .data:0x00000178; // type:object size:0x18 lbl_278_data_190 = .data:0x00000190; // type:object size:0x58 diff --git a/config/SOUE01/rels/d_a_obj_sw_dirNP/symbols.txt b/config/SOUE01/rels/d_a_obj_sw_dirNP/symbols.txt index 0ccb69ff..21302c91 100644 --- a/config/SOUE01/rels/d_a_obj_sw_dirNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_sw_dirNP/symbols.txt @@ -68,10 +68,10 @@ g_profile_OBJ_SW_DIR = .data:0x00000010; // type:object size:0x7C lbl_276_data_8C = .data:0x0000008C; // type:object size:0xC lbl_276_data_98 = .data:0x00000098; // type:object size:0xC lbl_276_data_A4 = .data:0x000000A4; // type:object size:0xC -lbl_276_data_B0 = .data:0x000000B0; // type:object size:0xC data:4byte +AcOSwDir__switchNums = .data:0x000000B0; // type:object size:0xC data:4byte lbl_276_data_BC = .data:0x000000BC; // type:object size:0xC lbl_276_data_C8 = .data:0x000000C8; // type:object size:0x30 -lbl_276_data_F8 = .data:0x000000F8; // type:object size:0x80 +AcOSwDir__vtable = .data:0x000000F8; // type:object size:0x80 lbl_276_data_178 = .data:0x00000178; // type:object size:0x30 lbl_276_data_1A8 = .data:0x000001A8; // type:object size:0x30 lbl_276_data_1D8 = .data:0x000001D8; // type:object size:0x18 @@ -80,7 +80,7 @@ lbl_276_data_208 = .data:0x00000208; // type:object size:0x8C lbl_276_data_294 = .data:0x00000294; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_276_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_276_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_276_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcOSwDir__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOSwDir__STATE_DONE = .bss:0x00000058; // type:object size:0x30 data:4byte lbl_276_bss_88 = .bss:0x00000088; // type:object size:0x8 data:byte lbl_276_bss_90 = .bss:0x00000090; // type:object size:0x10 data:float diff --git a/config/SOUE01/rels/d_a_obj_sw_dir_doorNP/symbols.txt b/config/SOUE01/rels/d_a_obj_sw_dir_doorNP/symbols.txt index a6d582b5..40ddaeda 100644 --- a/config/SOUE01/rels/d_a_obj_sw_dir_doorNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_sw_dir_doorNP/symbols.txt @@ -99,8 +99,8 @@ lbl_277_data_198 = .data:0x00000198; // type:object size:0x1C8 lbl_277_data_360 = .data:0x00000360; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_277_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_277_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_277_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_277_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_277_bss_D8 = .bss:0x000000D8; // type:object size:0x80 data:4byte -lbl_277_bss_158 = .bss:0x00000158; // type:object size:0x68 data:4byte +AcOSwDirDoor__StateID_Wait = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOSwDirDoor__StateID_CorrectStart = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOSwDirDoor__StateID_Correct = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOSwDirDoor__StateID_Broken = .bss:0x000000D8; // type:object size:0x80 data:4byte +AcOSwDirDoor__StateID_DemoEnd = .bss:0x00000158; // type:object size:0x68 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_sw_harpNP/symbols.txt b/config/SOUE01/rels/d_a_obj_sw_harpNP/symbols.txt index 833bf51a..1e0809ae 100644 --- a/config/SOUE01/rels/d_a_obj_sw_harpNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_sw_harpNP/symbols.txt @@ -88,7 +88,7 @@ lbl_514_data_2C = .data:0x0000002C; // type:object size:0x38 lbl_514_data_64 = .data:0x00000064; // type:object size:0x4 data:4byte lbl_514_data_68 = .data:0x00000068; // type:object size:0x4 data:4byte lbl_514_data_6C = .data:0x0000006C; // type:object size:0x8 -lbl_514_data_74 = .data:0x00000074; // type:object size:0xAC +AcOSwHarp__vtable = .data:0x00000074; // type:object size:0xAC lbl_514_data_120 = .data:0x00000120; // type:object size:0x30 lbl_514_data_150 = .data:0x00000150; // type:object size:0x30 lbl_514_data_180 = .data:0x00000180; // type:object size:0x18 @@ -97,8 +97,8 @@ lbl_514_data_1B0 = .data:0x000001B0; // type:object size:0x180 lbl_514_data_330 = .data:0x00000330; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_514_bss_8 = .bss:0x00000008; // type:object size:0x10 data:float -lbl_514_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_514_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_514_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +AcOSwHarp__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOSwHarp__STATE_ON_SWITCH = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOSwHarp__STATE_END_DEMO = .bss:0x00000098; // type:object size:0x30 data:4byte lbl_514_bss_C8 = .bss:0x000000C8; // type:object size:0xC data:float lbl_514_bss_D4 = .bss:0x000000D4; // type:object size:0xC data:float diff --git a/config/SOUE01/rels/d_a_obj_sw_sword_beamNP/symbols.txt b/config/SOUE01/rels/d_a_obj_sw_sword_beamNP/symbols.txt index 80843fda..34dda342 100644 --- a/config/SOUE01/rels/d_a_obj_sw_sword_beamNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_sw_sword_beamNP/symbols.txt @@ -83,7 +83,7 @@ lbl_507_data_50 = .data:0x00000050; // type:object size:0x10 data:string lbl_507_data_60 = .data:0x00000060; // type:object size:0x20 lbl_507_data_80 = .data:0x00000080; // type:object size:0xC data:string lbl_507_data_8C = .data:0x0000008C; // type:object size:0xC data:float -lbl_507_data_98 = .data:0x00000098; // type:object size:0x80 +AcOSwSwordBeam__vtable = .data:0x00000098; // type:object size:0x80 lbl_507_data_118 = .data:0x00000118; // type:object size:0x30 lbl_507_data_148 = .data:0x00000148; // type:object size:0x30 lbl_507_data_178 = .data:0x00000178; // type:object size:0x18 @@ -92,10 +92,10 @@ lbl_507_data_234 = .data:0x00000234; // type:object size:0x174 lbl_507_data_3A8 = .data:0x000003A8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_507_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_507_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_507_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_507_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_507_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_507_bss_118 = .bss:0x00000118; // type:object size:0x30 data:4byte +AcOSwSwordBeam__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOSwSwordBeam__STATE_ROTATE = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOSwSwordBeam__STATE_ROTATE_END = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOSwSwordBeam__STATE_ON_SWITCH = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOSwSwordBeam__STATE_END = .bss:0x00000118; // type:object size:0x30 data:4byte lbl_507_bss_148 = .bss:0x00000148; // type:object size:0x8 data:byte lbl_507_bss_150 = .bss:0x00000150; // type:object size:0x10 data:float diff --git a/config/SOUE01/rels/d_a_obj_sw_syakoNP/symbols.txt b/config/SOUE01/rels/d_a_obj_sw_syakoNP/symbols.txt index 898517f1..99806484 100644 --- a/config/SOUE01/rels/d_a_obj_sw_syakoNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_sw_syakoNP/symbols.txt @@ -82,7 +82,7 @@ lbl_479_data_10 = .data:0x00000010; // type:object size:0x10 lbl_479_data_20 = .data:0x00000020; // type:object size:0x5C lbl_479_data_7C = .data:0x0000007C; // type:object size:0x4 data:4byte lbl_479_data_80 = .data:0x00000080; // type:object size:0x8 data:4byte -lbl_479_data_88 = .data:0x00000088; // type:object size:0x80 +AcOSwSyako__vtable = .data:0x00000088; // type:object size:0x80 lbl_479_data_108 = .data:0x00000108; // type:object size:0x30 lbl_479_data_138 = .data:0x00000138; // type:object size:0x30 lbl_479_data_168 = .data:0x00000168; // type:object size:0x18 @@ -93,5 +93,5 @@ lbl_479_data_1B0 = .data:0x000001B0; // type:object size:0x9C lbl_479_data_24C = .data:0x0000024C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_479_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_479_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_479_bss_58 = .bss:0x00000058; // type:object size:0x50 data:4byte +AcOSwSyako__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOSwSyako__STATE_EVENT = .bss:0x00000058; // type:object size:0x50 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_switch_shutterNP/symbols.txt b/config/SOUE01/rels/d_a_obj_switch_shutterNP/symbols.txt index 2c3825d1..2f363b31 100644 --- a/config/SOUE01/rels/d_a_obj_switch_shutterNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_switch_shutterNP/symbols.txt @@ -64,7 +64,7 @@ lbl_320_rodata_38 = .rodata:0x00000038; // type:object size:0x24 lbl_320_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 data:float g_profile_OBJ_SWITCH_SHUTTER = .data:0x00000000; // type:object size:0x50 data:4byte lbl_320_data_50 = .data:0x00000050; // type:object size:0x20 -lbl_320_data_70 = .data:0x00000070; // type:object size:0x80 +AcOSwShutter__vtable = .data:0x00000070; // type:object size:0x80 lbl_320_data_F0 = .data:0x000000F0; // type:object size:0x30 lbl_320_data_120 = .data:0x00000120; // type:object size:0x30 lbl_320_data_150 = .data:0x00000150; // type:object size:0x18 @@ -72,4 +72,4 @@ lbl_320_data_168 = .data:0x00000168; // type:object size:0xEC lbl_320_data_254 = .data:0x00000254; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_320_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_320_bss_18 = .bss:0x00000018; // type:object size:0xB0 data:4byte +AcOSwShutter__STATE_WAIT = .bss:0x00000018; // type:object size:0xB0 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_switch_wallNP/symbols.txt b/config/SOUE01/rels/d_a_obj_switch_wallNP/symbols.txt index 6ecf90a3..851b6ec7 100644 --- a/config/SOUE01/rels/d_a_obj_switch_wallNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_switch_wallNP/symbols.txt @@ -51,7 +51,7 @@ lbl_253_rodata_0 = .rodata:0x00000000; // type:object size:0x30 data:float lbl_253_rodata_30 = .rodata:0x00000030; // type:object size:0xC data:float g_profile_OBJ_SWITCH_WALL = .data:0x00000000; // type:object size:0x3C data:4byte lbl_253_data_3C = .data:0x0000003C; // type:object size:0x3C -lbl_253_data_78 = .data:0x00000078; // type:object size:0x80 +AcOswitchWall__vtable = .data:0x00000078; // type:object size:0x80 lbl_253_data_F8 = .data:0x000000F8; // type:object size:0x30 lbl_253_data_128 = .data:0x00000128; // type:object size:0x30 lbl_253_data_158 = .data:0x00000158; // type:object size:0x18 @@ -60,5 +60,5 @@ lbl_253_data_188 = .data:0x00000188; // type:object size:0xA0 lbl_253_data_228 = .data:0x00000228; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_253_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_253_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_253_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcOswitchWall__StateID_Up = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOswitchWall__StateID_Down = .bss:0x00000058; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_sword_candleNP/symbols.txt b/config/SOUE01/rels/d_a_obj_sword_candleNP/symbols.txt index a29535f7..4cce32f1 100644 --- a/config/SOUE01/rels/d_a_obj_sword_candleNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_sword_candleNP/symbols.txt @@ -59,7 +59,7 @@ g_profile_OBJ_SWORD_CANDLE = .data:0x00000008; // type:object size:0x94 lbl_530_data_9C = .data:0x0000009C; // type:object size:0xC lbl_530_data_A8 = .data:0x000000A8; // type:object size:0x48 lbl_530_data_F0 = .data:0x000000F0; // type:object size:0x4 -lbl_530_data_F4 = .data:0x000000F4; // type:object size:0x8C +AcSwordCandle__vtable = .data:0x000000F4; // type:object size:0x8C lbl_530_data_180 = .data:0x00000180; // type:object size:0x30 lbl_530_data_1B0 = .data:0x000001B0; // type:object size:0x30 lbl_530_data_1E0 = .data:0x000001E0; // type:object size:0x18 @@ -68,4 +68,4 @@ lbl_530_data_210 = .data:0x00000210; // type:object size:0xA0 lbl_530_data_2B0 = .data:0x000002B0; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_530_bss_8 = .bss:0x00000008; // type:object size:0x18 data:4byte -lbl_530_bss_20 = .bss:0x00000020; // type:object size:0x70 data:4byte +AcSwordCandle__STATE_WAIT = .bss:0x00000020; // type:object size:0x70 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_swrd_prjNP/symbols.txt b/config/SOUE01/rels/d_a_obj_swrd_prjNP/symbols.txt index 373b38b2..0c0fb3fb 100644 --- a/config/SOUE01/rels/d_a_obj_swrd_prjNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_swrd_prjNP/symbols.txt @@ -135,20 +135,20 @@ lbl_521_data_58 = .data:0x00000058; // type:object size:0x40 lbl_521_data_98 = .data:0x00000098; // type:object size:0x10 lbl_521_data_A8 = .data:0x000000A8; // type:object size:0xC lbl_521_data_B4 = .data:0x000000B4; // type:object size:0x14 -lbl_521_data_C8 = .data:0x000000C8; // type:object size:0x80 +AcOSwrdPrj__vtable = .data:0x000000C8; // type:object size:0x80 lbl_521_data_148 = .data:0x00000148; // type:object size:0xC lbl_521_data_154 = .data:0x00000154; // type:object size:0x2C data:4byte lbl_521_data_180 = .data:0x00000180; // type:object size:0x30 lbl_521_data_1B0 = .data:0x000001B0; // type:object size:0x30 lbl_521_data_1E0 = .data:0x000001E0; // type:object size:0x18 lbl_521_data_1F8 = .data:0x000001F8; // type:object size:0x18 -lbl_521_data_210 = .data:0x00000210; // type:object size:0x2A8 +AcOSwrdPrjPathSeg__vtable = .data:0x00000210; // type:object size:0x2A8 lbl_521_data_4B8 = .data:0x000004B8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_521_bss_8 = .bss:0x00000008; // type:object size:0x50 data:4byte -lbl_521_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_521_bss_98 = .bss:0x00000098; // type:object size:0x80 data:4byte -lbl_521_bss_118 = .bss:0x00000118; // type:object size:0x80 data:4byte +AcOSwrdPrj__STATE_WAIT_APPEAR = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOSwrdPrj__STATE_WAIT = .bss:0x00000098; // type:object size:0x80 data:4byte +AcOSwrdPrj__STATE_CHK_TRI = .bss:0x00000118; // type:object size:0x80 data:4byte lbl_521_bss_198 = .bss:0x00000198; // type:object size:0x80 data:4byte lbl_521_bss_218 = .bss:0x00000218; // type:object size:0x70 data:4byte lbl_521_bss_288 = .bss:0x00000288; // type:object size:0x1 data:byte diff --git a/config/SOUE01/rels/d_a_obj_syako_shutterNP/symbols.txt b/config/SOUE01/rels/d_a_obj_syako_shutterNP/symbols.txt index 50748149..901bf83f 100644 --- a/config/SOUE01/rels/d_a_obj_syako_shutterNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_syako_shutterNP/symbols.txt @@ -63,7 +63,7 @@ lbl_480_data_10 = .data:0x00000010; // type:object size:0xC data:string lbl_480_data_1C = .data:0x0000001C; // type:object size:0xC data:string lbl_480_data_28 = .data:0x00000028; // type:object size:0x10 lbl_480_data_38 = .data:0x00000038; // type:object size:0x20 data:string -lbl_480_data_58 = .data:0x00000058; // type:object size:0x80 +AcOSyakoShutter__vtable = .data:0x00000058; // type:object size:0x80 lbl_480_data_D8 = .data:0x000000D8; // type:object size:0x30 lbl_480_data_108 = .data:0x00000108; // type:object size:0x30 lbl_480_data_138 = .data:0x00000138; // type:object size:0x18 @@ -71,6 +71,6 @@ lbl_480_data_150 = .data:0x00000150; // type:object size:0xF0 lbl_480_data_240 = .data:0x00000240; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_480_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_480_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_480_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_480_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +AcOSyakoShutter__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOSyakoShutter__STATE_OPEN_EVENT = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOSyakoShutter__STATE_END = .bss:0x00000098; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_tarzan_poleNP/symbols.txt b/config/SOUE01/rels/d_a_obj_tarzan_poleNP/symbols.txt index f7aaecb6..11aba61c 100644 --- a/config/SOUE01/rels/d_a_obj_tarzan_poleNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_tarzan_poleNP/symbols.txt @@ -15,4 +15,4 @@ g_profile_OBJ_TARZAN_POLE = .data:0x00000000; // type:object size:0x10 lbl_288_data_10 = .data:0x00000010; // type:object size:0x30 lbl_288_data_40 = .data:0x00000040; // type:object size:0x8 data:string lbl_288_data_48 = .data:0x00000048; // type:object size:0x20 -lbl_288_data_68 = .data:0x00000068; // type:object size:0x80 +AcOTarzanPole__vtable = .data:0x00000068; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_teni_railNP/symbols.txt b/config/SOUE01/rels/d_a_obj_teni_railNP/symbols.txt index c473bf34..0c4c3820 100644 --- a/config/SOUE01/rels/d_a_obj_teni_railNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_teni_railNP/symbols.txt @@ -32,5 +32,5 @@ g_profile_OBJ_TENI_RAIL = .data:0x00000000; // type:object size:0x34 data:4byte lbl_526_data_34 = .data:0x00000034; // type:object size:0x14 lbl_526_data_48 = .data:0x00000048; // type:object size:0x14 lbl_526_data_5C = .data:0x0000005C; // type:object size:0xC -lbl_526_data_68 = .data:0x00000068; // type:object size:0x80 +AcOTeniRail__vtable = .data:0x00000068; // type:object size:0x80 lbl_526_data_E8 = .data:0x000000E8; // type:object size:0x40 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_teni_rail_postNP/symbols.txt b/config/SOUE01/rels/d_a_obj_teni_rail_postNP/symbols.txt index 076e8164..5831a439 100644 --- a/config/SOUE01/rels/d_a_obj_teni_rail_postNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_teni_rail_postNP/symbols.txt @@ -15,4 +15,4 @@ lbl_527_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float lbl_527_rodata_4 = .rodata:0x00000004; // type:object size:0x4 data:float g_profile_OBJ_TENI_RAIL_POST = .data:0x00000000; // type:object size:0x40 lbl_527_data_40 = .data:0x00000040; // type:object size:0x20 -lbl_527_data_60 = .data:0x00000060; // type:object size:0x80 +AcOTeniRailPost__vtable = .data:0x00000060; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_terry_islandNP/symbols.txt b/config/SOUE01/rels/d_a_obj_terry_islandNP/symbols.txt index 02d9cbe9..307544fe 100644 --- a/config/SOUE01/rels/d_a_obj_terry_islandNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_terry_islandNP/symbols.txt @@ -60,7 +60,7 @@ lbl_385_rodata_38 = .rodata:0x00000038; // type:object size:0x4 data:float g_profile_OBJ_TERRY_ISLAND = .data:0x00000000; // type:object size:0x10 data:4byte lbl_385_data_10 = .data:0x00000010; // type:object size:0x60 lbl_385_data_70 = .data:0x00000070; // type:object size:0x20 -lbl_385_data_90 = .data:0x00000090; // type:object size:0x80 +AcOterryIsland__vtable = .data:0x00000090; // type:object size:0x80 lbl_385_data_110 = .data:0x00000110; // type:object size:0x30 lbl_385_data_140 = .data:0x00000140; // type:object size:0x30 lbl_385_data_170 = .data:0x00000170; // type:object size:0x18 @@ -68,5 +68,5 @@ lbl_385_data_188 = .data:0x00000188; // type:object size:0x134 lbl_385_data_2BC = .data:0x000002BC; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_385_bss_8 = .bss:0x00000008; // type:object size:0x18 data:4byte -lbl_385_bss_20 = .bss:0x00000020; // type:object size:0x80 data:4byte -lbl_385_bss_A0 = .bss:0x000000A0; // type:object size:0x70 data:4byte +AcOterryIsland__STATE_WAIT = .bss:0x00000020; // type:object size:0x80 data:4byte +AcOterryIsland__STATE_VACUUM = .bss:0x000000A0; // type:object size:0x70 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_terry_shopNP/symbols.txt b/config/SOUE01/rels/d_a_obj_terry_shopNP/symbols.txt index 3b08f9e1..84866b57 100644 --- a/config/SOUE01/rels/d_a_obj_terry_shopNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_terry_shopNP/symbols.txt @@ -77,7 +77,7 @@ lbl_264_rodata_CC = .rodata:0x000000CC; // type:object size:0x40 data:float g_profile_OBJ_TERRY_SHOP = .data:0x00000000; // type:object size:0xBC data:4byte lbl_264_data_BC = .data:0x000000BC; // type:object size:0x7C lbl_264_data_138 = .data:0x00000138; // type:object size:0x10 -lbl_264_data_148 = .data:0x00000148; // type:object size:0x80 +AcOTerryShop__vtable = .data:0x00000148; // type:object size:0x80 lbl_264_data_1C8 = .data:0x000001C8; // type:object size:0x30 lbl_264_data_1F8 = .data:0x000001F8; // type:object size:0x30 lbl_264_data_228 = .data:0x00000228; // type:object size:0x18 @@ -86,6 +86,6 @@ lbl_264_data_258 = .data:0x00000258; // type:object size:0x120 lbl_264_data_378 = .data:0x00000378; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_264_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_264_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_264_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_264_bss_98 = .bss:0x00000098; // type:object size:0xC0 data:4byte +AcOTerryShop__StateID_Move = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOTerryShop__StateID_Stop = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOTerryShop__StateID_Enter = .bss:0x00000098; // type:object size:0xC0 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_time_baseNP/symbols.txt b/config/SOUE01/rels/d_a_obj_time_baseNP/symbols.txt index 0719b8ec..5d662c48 100644 --- a/config/SOUE01/rels/d_a_obj_time_baseNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_time_baseNP/symbols.txt @@ -61,7 +61,7 @@ lbl_588_data_74 = .data:0x00000074; // type:object size:0x44 lbl_588_data_B8 = .data:0x000000B8; // type:object size:0x1C data:string lbl_588_data_D4 = .data:0x000000D4; // type:object size:0x4 data:4byte lbl_588_data_D8 = .data:0x000000D8; // type:object size:0x8 data:4byte -lbl_588_data_E0 = .data:0x000000E0; // type:object size:0x80 +AcOTimeBase__vtable = .data:0x000000E0; // type:object size:0x80 lbl_588_data_160 = .data:0x00000160; // type:object size:0x30 lbl_588_data_190 = .data:0x00000190; // type:object size:0x30 lbl_588_data_1C0 = .data:0x000001C0; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_obj_time_boatNP/symbols.txt b/config/SOUE01/rels/d_a_obj_time_boatNP/symbols.txt index 9dcb9106..8f8c853a 100644 --- a/config/SOUE01/rels/d_a_obj_time_boatNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_time_boatNP/symbols.txt @@ -109,7 +109,7 @@ lbl_477_data_27C = .data:0x0000027C; // type:object size:0x4 data:float lbl_477_data_280 = .data:0x00000280; // type:object size:0x4 lbl_477_data_284 = .data:0x00000284; // type:object size:0x4 lbl_477_data_288 = .data:0x00000288; // type:object size:0x8 data:4byte -lbl_477_data_290 = .data:0x00000290; // type:object size:0x88 +AcOTimeBoat__vtable = .data:0x00000290; // type:object size:0x88 lbl_477_data_318 = .data:0x00000318; // type:object size:0x30 lbl_477_data_348 = .data:0x00000348; // type:object size:0x30 lbl_477_data_378 = .data:0x00000378; // type:object size:0x18 @@ -118,7 +118,7 @@ lbl_477_data_3A8 = .data:0x000003A8; // type:object size:0x130 lbl_477_data_4D8 = .data:0x000004D8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_477_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_477_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_477_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_477_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_477_bss_D8 = .bss:0x000000D8; // type:object size:0x30 data:4byte +AcOTimeBoat__StateID_Wait = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOTimeBoat__StateID_StartTimeSlip = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOTimeBoat__StateID_TSWait = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOTimeBoat__StateID_TSRide = .bss:0x000000D8; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_time_door_beforeNP/symbols.txt b/config/SOUE01/rels/d_a_obj_time_door_beforeNP/symbols.txt index a8c0a21c..8240bfc7 100644 --- a/config/SOUE01/rels/d_a_obj_time_door_beforeNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_time_door_beforeNP/symbols.txt @@ -49,7 +49,7 @@ lbl_581_data_10 = .data:0x00000010; // type:object size:0xC lbl_581_data_1C = .data:0x0000001C; // type:object size:0x1C lbl_581_data_38 = .data:0x00000038; // type:object size:0x5C lbl_581_data_94 = .data:0x00000094; // type:object size:0x44 -lbl_581_data_D8 = .data:0x000000D8; // type:object size:0x80 +AcOTimeDoorBefore__vtable = .data:0x000000D8; // type:object size:0x80 lbl_581_data_158 = .data:0x00000158; // type:object size:0x30 lbl_581_data_188 = .data:0x00000188; // type:object size:0x30 lbl_581_data_1B8 = .data:0x000001B8; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_obj_time_stoneNP/symbols.txt b/config/SOUE01/rels/d_a_obj_time_stoneNP/symbols.txt index 7461eb37..6ab8ea4f 100644 --- a/config/SOUE01/rels/d_a_obj_time_stoneNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_time_stoneNP/symbols.txt @@ -125,7 +125,7 @@ lbl_280_data_500 = .data:0x00000500; // type:object size:0x28 lbl_280_data_528 = .data:0x00000528; // type:object size:0x4 data:float lbl_280_data_52C = .data:0x0000052C; // type:object size:0x14 data:float lbl_280_data_540 = .data:0x00000540; // type:object size:0x48 -lbl_280_data_588 = .data:0x00000588; // type:object size:0x88 +AcOTimeshiftStone__vtable = .data:0x00000588; // type:object size:0x88 lbl_280_data_610 = .data:0x00000610; // type:object size:0x30 lbl_280_data_640 = .data:0x00000640; // type:object size:0x30 lbl_280_data_670 = .data:0x00000670; // type:object size:0x18 @@ -133,6 +133,6 @@ lbl_280_data_688 = .data:0x00000688; // type:object size:0x110 lbl_280_data_798 = .data:0x00000798; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_280_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_280_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_280_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_280_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +AcOTimeStone__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOTimeStone__STATE_TIME_SLIP = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOTimeStone__STATE_TIME_SLIP_END = .bss:0x00000098; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_toge_trapNP/symbols.txt b/config/SOUE01/rels/d_a_obj_toge_trapNP/symbols.txt index e3fe8958..5b28b985 100644 --- a/config/SOUE01/rels/d_a_obj_toge_trapNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_toge_trapNP/symbols.txt @@ -72,7 +72,7 @@ lbl_109_rodata_B4 = .rodata:0x000000B4; // type:object size:0x8 data:float lbl_109_rodata_BC = .rodata:0x000000BC; // type:object size:0xC data:float g_profile_OBJ_TOGE_TRAP = .data:0x00000000; // type:object size:0x48 data:4byte lbl_109_data_48 = .data:0x00000048; // type:object size:0x20 -lbl_109_data_68 = .data:0x00000068; // type:object size:0x80 +AcOtogeTrap__vtable = .data:0x00000068; // type:object size:0x80 lbl_109_data_E8 = .data:0x000000E8; // type:object size:0x30 lbl_109_data_118 = .data:0x00000118; // type:object size:0x30 lbl_109_data_148 = .data:0x00000148; // type:object size:0x18 @@ -81,7 +81,7 @@ lbl_109_data_178 = .data:0x00000178; // type:object size:0xB8 lbl_109_data_230 = .data:0x00000230; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_109_bss_8 = .bss:0x00000008; // type:object size:0x18 data:4byte -lbl_109_bss_20 = .bss:0x00000020; // type:object size:0x40 data:4byte -lbl_109_bss_60 = .bss:0x00000060; // type:object size:0x40 data:4byte +AcOtogeTrap__StateID_Wait = .bss:0x00000020; // type:object size:0x40 data:4byte +AcOtogeTrap__StateID_Move = .bss:0x00000060; // type:object size:0x40 data:4byte lbl_109_bss_A0 = .bss:0x000000A0; // type:object size:0x8 data:byte lbl_109_bss_A8 = .bss:0x000000A8; // type:object size:0x10 data:float diff --git a/config/SOUE01/rels/d_a_obj_tornadoNP/symbols.txt b/config/SOUE01/rels/d_a_obj_tornadoNP/symbols.txt index 08156434..5021e5f9 100644 --- a/config/SOUE01/rels/d_a_obj_tornadoNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_tornadoNP/symbols.txt @@ -57,7 +57,7 @@ lbl_164_data_18 = .data:0x00000018; // type:object size:0x10 lbl_164_data_28 = .data:0x00000028; // type:object size:0x1C lbl_164_data_44 = .data:0x00000044; // type:object size:0xC lbl_164_data_50 = .data:0x00000050; // type:object size:0x10 -lbl_164_data_60 = .data:0x00000060; // type:object size:0x80 +AcOTornado__vtable = .data:0x00000060; // type:object size:0x80 lbl_164_data_E0 = .data:0x000000E0; // type:object size:0x30 lbl_164_data_110 = .data:0x00000110; // type:object size:0x30 lbl_164_data_140 = .data:0x00000140; // type:object size:0x18 @@ -65,4 +65,4 @@ lbl_164_data_158 = .data:0x00000158; // type:object size:0x78 lbl_164_data_1D0 = .data:0x000001D0; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_164_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_164_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcOTornado__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_tower_D101NP/symbols.txt b/config/SOUE01/rels/d_a_obj_tower_D101NP/symbols.txt index c189222d..df9d9995 100644 --- a/config/SOUE01/rels/d_a_obj_tower_D101NP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_tower_D101NP/symbols.txt @@ -99,7 +99,7 @@ lbl_323_data_A8 = .data:0x000000A8; // type:object size:0x10 data:4byte lbl_323_data_B8 = .data:0x000000B8; // type:object size:0xC lbl_323_data_C4 = .data:0x000000C4; // type:object size:0x20 jumptable_323_data_E4 = .data:0x000000E4; // type:object size:0x24 scope:local -lbl_323_data_108 = .data:0x00000108; // type:object size:0x80 +AcOTowerD101__vtable = .data:0x00000108; // type:object size:0x80 lbl_323_data_188 = .data:0x00000188; // type:object size:0x30 lbl_323_data_1B8 = .data:0x000001B8; // type:object size:0x30 lbl_323_data_1E8 = .data:0x000001E8; // type:object size:0x18 @@ -109,4 +109,4 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa lbl_323_bss_8 = .bss:0x00000008; // type:object size:0x4 data:float lbl_323_bss_C = .bss:0x0000000C; // type:object size:0x4 data:float lbl_323_bss_10 = .bss:0x00000010; // type:object size:0x10 -lbl_323_bss_20 = .bss:0x00000020; // type:object size:0x30 data:4byte +AcOTowerD101__STATE_WAIT = .bss:0x00000020; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_tower_bombNP/symbols.txt b/config/SOUE01/rels/d_a_obj_tower_bombNP/symbols.txt index 1457f05d..92f1fff6 100644 --- a/config/SOUE01/rels/d_a_obj_tower_bombNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_tower_bombNP/symbols.txt @@ -83,7 +83,7 @@ lbl_489_data_CC = .data:0x000000CC; // type:object size:0x14 lbl_489_data_E0 = .data:0x000000E0; // type:object size:0xA8 lbl_489_data_188 = .data:0x00000188; // type:object size:0x4 data:4byte lbl_489_data_18C = .data:0x0000018C; // type:object size:0x4 data:4byte -lbl_489_data_190 = .data:0x00000190; // type:object size:0x80 +AcOTowerBomb__vtable = .data:0x00000190; // type:object size:0x80 lbl_489_data_210 = .data:0x00000210; // type:object size:0x30 lbl_489_data_240 = .data:0x00000240; // type:object size:0x30 lbl_489_data_270 = .data:0x00000270; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_obj_treasure_islandNP/symbols.txt b/config/SOUE01/rels/d_a_obj_treasure_islandNP/symbols.txt index 5674c4f1..dee7b65d 100644 --- a/config/SOUE01/rels/d_a_obj_treasure_islandNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_treasure_islandNP/symbols.txt @@ -39,4 +39,4 @@ g_profile_OBJ_TREASURE_ISLAND = .data:0x00000140; // type:object size:0x10 lbl_392_data_150 = .data:0x00000150; // type:object size:0x10 lbl_392_data_160 = .data:0x00000160; // type:object size:0x10 lbl_392_data_170 = .data:0x00000170; // type:object size:0x28 -lbl_392_data_198 = .data:0x00000198; // type:object size:0x80 +AcOtreasureIsland__vtable = .data:0x00000198; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_treasure_island_bNP/symbols.txt b/config/SOUE01/rels/d_a_obj_treasure_island_bNP/symbols.txt index fe36cd89..fe510ba1 100644 --- a/config/SOUE01/rels/d_a_obj_treasure_island_bNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_treasure_island_bNP/symbols.txt @@ -48,9 +48,9 @@ lbl_415_rodata_0 = .rodata:0x00000000; // type:object size:0x18 data:float lbl_415_rodata_18 = .rodata:0x00000018; // type:object size:0x4 data:float lbl_415_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 data:float g_profile_OBJ_TREASURE_ISLAND_B = .data:0x00000000; // type:object size:0x10 data:4byte -lbl_415_data_10 = .data:0x00000010; // type:object size:0x8C +AcOtreasureIslandB__colliderInit = .data:0x00000010; // type:object size:0x8C lbl_415_data_9C = .data:0x0000009C; // type:object size:0x24 -lbl_415_data_C0 = .data:0x000000C0; // type:object size:0x80 +AcOtreasureIslandB__vtable = .data:0x000000C0; // type:object size:0x80 lbl_415_data_140 = .data:0x00000140; // type:object size:0x30 lbl_415_data_170 = .data:0x00000170; // type:object size:0x30 lbl_415_data_1A0 = .data:0x000001A0; // type:object size:0x18 @@ -58,6 +58,6 @@ lbl_415_data_1B8 = .data:0x000001B8; // type:object size:0xB0 lbl_415_data_268 = .data:0x00000268; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_415_bss_8 = .bss:0x00000008; // type:object size:0x10 data:float -lbl_415_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_415_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcOtreasureIslandB__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOtreasureIslandB__STATE_COVER_BREAK = .bss:0x00000058; // type:object size:0x30 data:4byte lbl_415_bss_88 = .bss:0x00000088; // type:object size:0xC data:float diff --git a/config/SOUE01/rels/d_a_obj_triforceNP/symbols.txt b/config/SOUE01/rels/d_a_obj_triforceNP/symbols.txt index e6e9d62c..f52deec3 100644 --- a/config/SOUE01/rels/d_a_obj_triforceNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_triforceNP/symbols.txt @@ -10,7 +10,7 @@ draw__14dAcOtriforce_cFv = .text:0x00000450; // type:function size:0x28 __dt__14dAcOtriforce_cFv = .text:0x00000480; // type:function size:0x8C _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -lbl_625_rodata_0 = .rodata:0x00000000; // type:object size:0xC scope:local data:float +dAcOtriforce_c__sScale = .rodata:0x00000000; // type:object size:0xC scope:local data:float lbl_625_rodata_C = .rodata:0x0000000C; // type:object size:0x1C scope:local data:float g_profile_OBJ_TRIFORCE = .data:0x00000000; // type:object size:0x10 sCcSrc__14dAcOtriforce_c = .data:0x00000010; // type:object size:0x2C diff --git a/config/SOUE01/rels/d_a_obj_trolleyNP/symbols.txt b/config/SOUE01/rels/d_a_obj_trolleyNP/symbols.txt index 7a5b097e..fdd0349f 100644 --- a/config/SOUE01/rels/d_a_obj_trolleyNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_trolleyNP/symbols.txt @@ -236,7 +236,7 @@ lbl_470_data_344 = .data:0x00000344; // type:object size:0x4 data:4byte lbl_470_data_348 = .data:0x00000348; // type:object size:0x14 data:4byte lbl_470_data_35C = .data:0x0000035C; // type:object size:0x10 data:float lbl_470_data_36C = .data:0x0000036C; // type:object size:0x2C -lbl_470_data_398 = .data:0x00000398; // type:object size:0x88 +AcOTrolley__vtable = .data:0x00000398; // type:object size:0x88 lbl_470_data_420 = .data:0x00000420; // type:object size:0x30 lbl_470_data_450 = .data:0x00000450; // type:object size:0x30 lbl_470_data_480 = .data:0x00000480; // type:object size:0x18 @@ -249,16 +249,16 @@ lbl_470_data_B0C = .data:0x00000B0C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_470_bss_8 = .bss:0x00000008; // type:object size:0x4 data:4byte lbl_470_bss_C = .bss:0x0000000C; // type:object size:0x14 data:byte -lbl_470_bss_20 = .bss:0x00000020; // type:object size:0x40 data:4byte -lbl_470_bss_60 = .bss:0x00000060; // type:object size:0x40 data:4byte -lbl_470_bss_A0 = .bss:0x000000A0; // type:object size:0x40 data:4byte -lbl_470_bss_E0 = .bss:0x000000E0; // type:object size:0x40 data:4byte -lbl_470_bss_120 = .bss:0x00000120; // type:object size:0x80 data:4byte -lbl_470_bss_1A0 = .bss:0x000001A0; // type:object size:0x40 data:4byte -lbl_470_bss_1E0 = .bss:0x000001E0; // type:object size:0x40 data:4byte -lbl_470_bss_220 = .bss:0x00000220; // type:object size:0xC0 data:4byte -lbl_470_bss_2E0 = .bss:0x000002E0; // type:object size:0x40 data:4byte -lbl_470_bss_320 = .bss:0x00000320; // type:object size:0x40 data:4byte -lbl_470_bss_360 = .bss:0x00000360; // type:object size:0x80 data:4byte -lbl_470_bss_3E0 = .bss:0x000003E0; // type:object size:0x40 data:4byte -lbl_470_bss_420 = .bss:0x00000420; // type:object size:0x70 data:4byte +AcOTrolley__StateID_Wait = .bss:0x00000020; // type:object size:0x40 data:4byte +AcOTrolley__StateID_RideAction = .bss:0x00000060; // type:object size:0x40 data:4byte +AcOTrolley__StateID_StartAction = .bss:0x000000A0; // type:object size:0x40 data:4byte +AcOTrolley__StateID_PathMove = .bss:0x000000E0; // type:object size:0x40 data:4byte +AcOTrolley__StateID_StopAction = .bss:0x00000120; // type:object size:0x80 data:4byte +AcOTrolley__StateID_PushPull = .bss:0x000001A0; // type:object size:0x40 data:4byte +AcOTrolley__StateID_Fall = .bss:0x000001E0; // type:object size:0x40 data:4byte +AcOTrolley__StateID_End = .bss:0x00000220; // type:object size:0xC0 data:4byte +AcOTrolley__StateID_WaitOpenDoor = .bss:0x000002E0; // type:object size:0x40 data:4byte +AcOTrolley__StateID_RestartWait = .bss:0x00000320; // type:object size:0x40 data:4byte +AcOTrolley__StateiD_BuriedSand = .bss:0x00000360; // type:object size:0x80 data:4byte +AcOTrolley__StateID_F302RevivalDemo = .bss:0x000003E0; // type:object size:0x40 data:4byte +AcOTrolley__StateID_TimeSlipEndFromAnother = .bss:0x00000420; // type:object size:0x70 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_truckNP/symbols.txt b/config/SOUE01/rels/d_a_obj_truckNP/symbols.txt index ab5e859a..7d480195 100644 --- a/config/SOUE01/rels/d_a_obj_truckNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_truckNP/symbols.txt @@ -108,7 +108,7 @@ lbl_260_data_9C = .data:0x0000009C; // type:object size:0x8 data:4byte lbl_260_data_A4 = .data:0x000000A4; // type:object size:0x4 data:4byte lbl_260_data_A8 = .data:0x000000A8; // type:object size:0x4 data:4byte lbl_260_data_AC = .data:0x000000AC; // type:object size:0x3C data:4byte -lbl_260_data_E8 = .data:0x000000E8; // type:object size:0x80 +AcOtruck__vtable = .data:0x000000E8; // type:object size:0x80 lbl_260_data_168 = .data:0x00000168; // type:object size:0x30 lbl_260_data_198 = .data:0x00000198; // type:object size:0x30 lbl_260_data_1C8 = .data:0x000001C8; // type:object size:0x18 @@ -117,10 +117,10 @@ lbl_260_data_1F8 = .data:0x000001F8; // type:object size:0x110 lbl_260_data_308 = .data:0x00000308; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_260_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_260_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_260_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_260_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_260_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOtruck__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOtruck__STATE_READY = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOtruck__STATE_PATH_MOVE = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOtruck__STATE_SINK = .bss:0x000000D8; // type:object size:0x40 data:4byte lbl_260_bss_118 = .bss:0x00000118; // type:object size:0x1 data:byte lbl_260_bss_11C = .bss:0x0000011C; // type:object size:0xC data:float lbl_260_bss_128 = .bss:0x00000128; // type:object size:0x8 data:byte diff --git a/config/SOUE01/rels/d_a_obj_truck_rail_colNP/symbols.txt b/config/SOUE01/rels/d_a_obj_truck_rail_colNP/symbols.txt index c2d6228c..3dfcbcdf 100644 --- a/config/SOUE01/rels/d_a_obj_truck_rail_colNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_truck_rail_colNP/symbols.txt @@ -53,4 +53,4 @@ lbl_528_data_158 = .data:0x00000158; // type:object size:0x60 lbl_528_data_1B8 = .data:0x000001B8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_528_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_528_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcOTruckRailCol__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_truck_stopperNP/symbols.txt b/config/SOUE01/rels/d_a_obj_truck_stopperNP/symbols.txt index ebb4a3c8..ba4a8ed2 100644 --- a/config/SOUE01/rels/d_a_obj_truck_stopperNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_truck_stopperNP/symbols.txt @@ -49,7 +49,7 @@ lbl_409_rodata_20 = .rodata:0x00000020; // type:object size:0x4 data:float lbl_409_rodata_24 = .rodata:0x00000024; // type:object size:0x4 data:float g_profile_OBJ_TRUCK_STOPPER = .data:0x00000000; // type:object size:0x60 data:4byte lbl_409_data_60 = .data:0x00000060; // type:object size:0x20 data:string -lbl_409_data_80 = .data:0x00000080; // type:object size:0x80 +AcOtruckStopper__vtable = .data:0x00000080; // type:object size:0x80 lbl_409_data_100 = .data:0x00000100; // type:object size:0x30 lbl_409_data_130 = .data:0x00000130; // type:object size:0x30 lbl_409_data_160 = .data:0x00000160; // type:object size:0x18 @@ -57,5 +57,5 @@ lbl_409_data_178 = .data:0x00000178; // type:object size:0xA8 lbl_409_data_220 = .data:0x00000220; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_409_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_409_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_409_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcOtruckStopper__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOtruckStopper__STATE_BREAK = .bss:0x00000058; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_undergroundNP/symbols.txt b/config/SOUE01/rels/d_a_obj_undergroundNP/symbols.txt index 70b44698..ef010cbd 100644 --- a/config/SOUE01/rels/d_a_obj_undergroundNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_undergroundNP/symbols.txt @@ -39,4 +39,4 @@ lbl_458_data_E4 = .data:0x000000E4; // type:object size:0x10 lbl_458_data_F4 = .data:0x000000F4; // type:object size:0x14 g_profile_OBJ_UNDERGROUND = .data:0x00000108; // type:object size:0x10 lbl_458_data_118 = .data:0x00000118; // type:object size:0x20 -lbl_458_data_138 = .data:0x00000138; // type:object size:0x80 +AcOUnderground__vtable = .data:0x00000138; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_updown_lavaNP/symbols.txt b/config/SOUE01/rels/d_a_obj_updown_lavaNP/symbols.txt index b80e646e..4b84b409 100644 --- a/config/SOUE01/rels/d_a_obj_updown_lavaNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_updown_lavaNP/symbols.txt @@ -81,7 +81,7 @@ lbl_353_data_88 = .data:0x00000088; // type:object size:0x18 g_profile_OBJ_UPDOWN_LAVA = .data:0x000000A0; // type:object size:0x10 lbl_353_data_B0 = .data:0x000000B0; // type:object size:0xC lbl_353_data_BC = .data:0x000000BC; // type:object size:0x24 -lbl_353_data_E0 = .data:0x000000E0; // type:object size:0x80 +AcOupdownLava__vtable = .data:0x000000E0; // type:object size:0x80 lbl_353_data_160 = .data:0x00000160; // type:object size:0x30 lbl_353_data_190 = .data:0x00000190; // type:object size:0x30 lbl_353_data_1C0 = .data:0x000001C0; // type:object size:0x18 @@ -89,7 +89,7 @@ lbl_353_data_1D8 = .data:0x000001D8; // type:object size:0x1D4 lbl_353_data_3AC = .data:0x000003AC; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_353_bss_8 = .bss:0x00000008; // type:object size:0xB8 data:4byte -lbl_353_bss_C0 = .bss:0x000000C0; // type:object size:0x40 data:4byte -lbl_353_bss_100 = .bss:0x00000100; // type:object size:0x80 data:4byte -lbl_353_bss_180 = .bss:0x00000180; // type:object size:0x40 data:4byte -lbl_353_bss_1C0 = .bss:0x000001C0; // type:object size:0x30 data:4byte +AcOupdownLava__STATE_UP_DOWN = .bss:0x000000C0; // type:object size:0x40 data:4byte +AcOupdownLava__STATE_STOP = .bss:0x00000100; // type:object size:0x80 data:4byte +AcOupdownLava__STATE_SINK = .bss:0x00000180; // type:object size:0x40 data:4byte +AcOupdownLava__STATE_DOWN = .bss:0x000001C0; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_uta_demo_pedestNP/symbols.txt b/config/SOUE01/rels/d_a_obj_uta_demo_pedestNP/symbols.txt index fad7c65d..7187070f 100644 --- a/config/SOUE01/rels/d_a_obj_uta_demo_pedestNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_uta_demo_pedestNP/symbols.txt @@ -10,8 +10,8 @@ draw__19dAcOutaDemoPedest_cFv = .text:0x00000280; // type:function size:0x28 __dt__19dAcOutaDemoPedest_cFv = .text:0x000002B0; // type:function size:0x68 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -lbl_427_rodata_0 = .rodata:0x00000000; // type:object size:0x8 scope:local -lbl_427_data_0 = .data:0x00000000; // type:object size:0x14 scope:local +sMdlNames2 = .rodata:0x00000000; // type:object size:0x8 scope:local +s_StageF010rPedest_80dc3228 = .data:0x00000000; // type:object size:0x14 scope:local lbl_427_data_14 = .data:0x00000014; // type:object size:0x14 scope:local g_profile_OBJ_UTA_DEMO_PEDEST = .data:0x00000028; // type:object size:0x10 lbl_427_data_38 = .data:0x00000038; // type:object size:0x10 scope:local data:string diff --git a/config/SOUE01/rels/d_a_obj_utajimaNP/symbols.txt b/config/SOUE01/rels/d_a_obj_utajimaNP/symbols.txt index 8a25e030..5433b997 100644 --- a/config/SOUE01/rels/d_a_obj_utajimaNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_utajimaNP/symbols.txt @@ -11,7 +11,7 @@ draw__13dAcOutajima_cFv = .text:0x00000400; // type:function size:0x60 __dt__13dAcOutajima_cFv = .text:0x00000460; // type:function size:0x80 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -lbl_368_rodata_0 = .rodata:0x00000000; // type:object size:0x8 scope:local data:4byte +mMdlNames = .rodata:0x00000000; // type:object size:0x8 scope:local data:4byte lbl_368_rodata_8 = .rodata:0x00000008; // type:object size:0x4 scope:local data:float lbl_368_data_0 = .data:0x00000000; // type:object size:0x8 scope:local lbl_368_data_8 = .data:0x00000008; // type:object size:0x10 scope:local diff --git a/config/SOUE01/rels/d_a_obj_utajima_lv2NP/symbols.txt b/config/SOUE01/rels/d_a_obj_utajima_lv2NP/symbols.txt index 2f855177..5b18d430 100644 --- a/config/SOUE01/rels/d_a_obj_utajima_lv2NP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_utajima_lv2NP/symbols.txt @@ -10,7 +10,7 @@ draw__16dAcOutajimaLv2_cFv = .text:0x00000330; // type:function size:0x28 __dt__16dAcOutajimaLv2_cFv = .text:0x00000360; // type:function size:0x74 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -lbl_403_rodata_0 = .rodata:0x00000000; // type:object size:0x20 scope:local data:float +dAcOutajimaLv2_c__someFloat = .rodata:0x00000000; // type:object size:0x20 scope:local data:float g_profile_OBJ_UTAJIMA_LV2 = .data:0x00000000; // type:object size:0x10 lbl_403_data_38 = .data:0x00000038; // type:object size:0x20 scope:local __vt__16dAcOutajimaLv2_c = .data:0x00000058; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_utajima_main_mechaNP/symbols.txt b/config/SOUE01/rels/d_a_obj_utajima_main_mechaNP/symbols.txt index f1baec8f..1f4b80f3 100644 --- a/config/SOUE01/rels/d_a_obj_utajima_main_mechaNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_utajima_main_mechaNP/symbols.txt @@ -82,7 +82,7 @@ lbl_364_data_64 = .data:0x00000064; // type:object size:0x4 data:4byte lbl_364_data_68 = .data:0x00000068; // type:object size:0x24 data:string lbl_364_data_8C = .data:0x0000008C; // type:object size:0x4 data:4byte lbl_364_data_90 = .data:0x00000090; // type:object size:0x8 data:4byte -lbl_364_data_98 = .data:0x00000098; // type:object size:0x80 +AcOutajimaMainMecha__vtable = .data:0x00000098; // type:object size:0x80 lbl_364_data_118 = .data:0x00000118; // type:object size:0x30 lbl_364_data_148 = .data:0x00000148; // type:object size:0x30 lbl_364_data_178 = .data:0x00000178; // type:object size:0x18 @@ -90,6 +90,6 @@ lbl_364_data_190 = .data:0x00000190; // type:object size:0x284 lbl_364_data_414 = .data:0x00000414; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_364_bss_8 = .bss:0x00000008; // type:object size:0x90 data:4byte -lbl_364_bss_98 = .bss:0x00000098; // type:object size:0xC0 data:4byte -lbl_364_bss_158 = .bss:0x00000158; // type:object size:0x80 data:4byte -lbl_364_bss_1D8 = .bss:0x000001D8; // type:object size:0x30 data:4byte +AcOutajimaMainMecha__STATE_MAIN = .bss:0x00000098; // type:object size:0xC0 data:4byte +AcOutajimaMainMecha__STATE_AFTER = .bss:0x00000158; // type:object size:0x80 data:4byte +AcOutajimaMainMecha__STATE_RESET = .bss:0x000001D8; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_utajima_pedestalNP/symbols.txt b/config/SOUE01/rels/d_a_obj_utajima_pedestalNP/symbols.txt index 4c6f4c29..d9f2c9dd 100644 --- a/config/SOUE01/rels/d_a_obj_utajima_pedestalNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_utajima_pedestalNP/symbols.txt @@ -54,7 +54,7 @@ lbl_365_rodata_8 = .rodata:0x00000008; // type:object size:0x4 data:float lbl_365_rodata_10 = .rodata:0x00000010; // type:object size:0x14 g_profile_OBJ_UTAJIMA_PEDESTAL = .data:0x00000000; // type:object size:0x5C data:4byte lbl_365_data_5C = .data:0x0000005C; // type:object size:0x24 -lbl_365_data_80 = .data:0x00000080; // type:object size:0x80 +AcOutajimaPedestal__vtable = .data:0x00000080; // type:object size:0x80 lbl_365_data_100 = .data:0x00000100; // type:object size:0x30 lbl_365_data_130 = .data:0x00000130; // type:object size:0x30 lbl_365_data_160 = .data:0x00000160; // type:object size:0x18 @@ -62,6 +62,6 @@ lbl_365_data_178 = .data:0x00000178; // type:object size:0xF4 lbl_365_data_26C = .data:0x0000026C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_365_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_365_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_365_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_365_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +AcOutajimaPedestal__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOutajimaPedestal__STATE_MOVE = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOutajimaPedestal__STATE_RESET = .bss:0x00000098; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_utajima_stopperNP/symbols.txt b/config/SOUE01/rels/d_a_obj_utajima_stopperNP/symbols.txt index b2622917..adc21d09 100644 --- a/config/SOUE01/rels/d_a_obj_utajima_stopperNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_utajima_stopperNP/symbols.txt @@ -62,7 +62,7 @@ lbl_363_rodata_44 = .rodata:0x00000044; // type:object size:0x4 data:float g_profile_OBJ_UTAJIMA_STOPPER = .data:0x00000000; // type:object size:0x50 data:4byte lbl_363_data_50 = .data:0x00000050; // type:object size:0x4 data:4byte lbl_363_data_54 = .data:0x00000054; // type:object size:0x24 -lbl_363_data_78 = .data:0x00000078; // type:object size:0x80 +AcOutajimaStopper__vtable = .data:0x00000078; // type:object size:0x80 lbl_363_data_F8 = .data:0x000000F8; // type:object size:0x30 lbl_363_data_128 = .data:0x00000128; // type:object size:0x30 lbl_363_data_158 = .data:0x00000158; // type:object size:0x18 @@ -70,8 +70,8 @@ lbl_363_data_170 = .data:0x00000170; // type:object size:0x180 lbl_363_data_2F0 = .data:0x000002F0; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_363_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_363_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_363_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_363_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_363_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_363_bss_118 = .bss:0x00000118; // type:object size:0x30 data:4byte +AcOutajimaStopper__STATE_DOWN = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOutajimaStopper__STATE_RISE = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOutajimaStopper__STATE_UP = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOutajimaStopper__STATE_FALL = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOutajimaStopper__STATE_WAIT = .bss:0x00000118; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_warpNP/symbols.txt b/config/SOUE01/rels/d_a_obj_warpNP/symbols.txt index 5aabcd45..89782687 100644 --- a/config/SOUE01/rels/d_a_obj_warpNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_warpNP/symbols.txt @@ -123,7 +123,7 @@ lbl_292_data_F4 = .data:0x000000F4; // type:object size:0x128 lbl_292_data_21C = .data:0x0000021C; // type:object size:0x4 data:4byte lbl_292_data_220 = .data:0x00000220; // type:object size:0x18 data:string lbl_292_data_238 = .data:0x00000238; // type:object size:0x8 -lbl_292_data_240 = .data:0x00000240; // type:object size:0xB0 +AcOWarp__vtable = .data:0x00000240; // type:object size:0xB0 lbl_292_data_2F0 = .data:0x000002F0; // type:object size:0x30 lbl_292_data_320 = .data:0x00000320; // type:object size:0x30 lbl_292_data_350 = .data:0x00000350; // type:object size:0x18 @@ -132,12 +132,12 @@ lbl_292_data_42C = .data:0x0000042C; // type:object size:0x1FC lbl_292_data_628 = .data:0x00000628; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_292_bss_8 = .bss:0x00000008; // type:object size:0x10 data:float -lbl_292_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_292_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_292_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_292_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_292_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_292_bss_158 = .bss:0x00000158; // type:object size:0x40 data:4byte -lbl_292_bss_198 = .bss:0x00000198; // type:object size:0x30 data:4byte +AcOWarp__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOWarp__STATE_SIREN_FINISH = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOWarp__STATE_GET_ITEM = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOWarp__StateID_GateWait = .bss:0x000000D8; // type:object size:0x40 data:4byte +AcOWarp__StateID_GateOpen = .bss:0x00000118; // type:object size:0x40 data:4byte +AcOWarp__StateID_GateIn = .bss:0x00000158; // type:object size:0x40 data:4byte +AcOWarp__StateID_GateClear = .bss:0x00000198; // type:object size:0x30 data:4byte lbl_292_bss_1C8 = .bss:0x000001C8; // type:object size:0xC data:float lbl_292_bss_1D4 = .bss:0x000001D4; // type:object size:0x6C data:float diff --git a/config/SOUE01/rels/d_a_obj_warp_holeNP/symbols.txt b/config/SOUE01/rels/d_a_obj_warp_holeNP/symbols.txt index 38dccec7..a138c20a 100644 --- a/config/SOUE01/rels/d_a_obj_warp_holeNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_warp_holeNP/symbols.txt @@ -19,4 +19,4 @@ lbl_619_data_10 = .data:0x00000010; // type:object size:0x30 lbl_619_data_40 = .data:0x00000040; // type:object size:0x1C data:string lbl_619_data_5C = .data:0x0000005C; // type:object size:0x1C lbl_619_data_78 = .data:0x00000078; // type:object size:0x20 -lbl_619_data_98 = .data:0x00000098; // type:object size:0x80 +AcOwarpHole__vtable = .data:0x00000098; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_a_obj_water_F100NP/symbols.txt b/config/SOUE01/rels/d_a_obj_water_F100NP/symbols.txt index e431c138..6c994973 100644 --- a/config/SOUE01/rels/d_a_obj_water_F100NP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_water_F100NP/symbols.txt @@ -18,4 +18,4 @@ lbl_416_data_10 = .data:0x00000010; // type:object size:0x8 lbl_416_data_18 = .data:0x00000018; // type:object size:0x8 g_profile_OBJ_WATER_F100 = .data:0x00000020; // type:object size:0x4C lbl_416_data_6C = .data:0x0000006C; // type:object size:0x24 -lbl_416_data_90 = .data:0x00000090; // type:object size:0x8C +AcOwaterF100__vtable = .data:0x00000090; // type:object size:0x8C diff --git a/config/SOUE01/rels/d_a_obj_water_jarNP/symbols.txt b/config/SOUE01/rels/d_a_obj_water_jarNP/symbols.txt index 846c58d9..bd7f8f8f 100644 --- a/config/SOUE01/rels/d_a_obj_water_jarNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_water_jarNP/symbols.txt @@ -78,7 +78,7 @@ lbl_601_data_10 = .data:0x00000010; // type:object size:0x70 lbl_601_data_80 = .data:0x00000080; // type:object size:0x1C data:string lbl_601_data_9C = .data:0x0000009C; // type:object size:0x4 data:4byte lbl_601_data_A0 = .data:0x000000A0; // type:object size:0x8 data:4byte -lbl_601_data_A8 = .data:0x000000A8; // type:object size:0x100 +AcOWaterJar__vtable = .data:0x000000A8; // type:object size:0x100 lbl_601_data_1A8 = .data:0x000001A8; // type:object size:0x30 lbl_601_data_1D8 = .data:0x000001D8; // type:object size:0x30 lbl_601_data_208 = .data:0x00000208; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_obj_water_surfaceNP/symbols.txt b/config/SOUE01/rels/d_a_obj_water_surfaceNP/symbols.txt index e200e93b..f23f7397 100644 --- a/config/SOUE01/rels/d_a_obj_water_surfaceNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_water_surfaceNP/symbols.txt @@ -92,7 +92,7 @@ lbl_390_data_238 = .data:0x00000238; // type:object size:0x4 data:4byte lbl_390_data_23C = .data:0x0000023C; // type:object size:0x4 data:4byte lbl_390_data_240 = .data:0x00000240; // type:object size:0x4 data:4byte lbl_390_data_244 = .data:0x00000244; // type:object size:0x4 data:4byte -lbl_390_data_248 = .data:0x00000248; // type:object size:0x80 +AcOwaterSurface__vtable = .data:0x00000248; // type:object size:0x80 lbl_390_data_2C8 = .data:0x000002C8; // type:object size:0x30 lbl_390_data_2F8 = .data:0x000002F8; // type:object size:0x30 lbl_390_data_328 = .data:0x00000328; // type:object size:0x18 @@ -100,6 +100,6 @@ lbl_390_data_340 = .data:0x00000340; // type:object size:0x144 lbl_390_data_484 = .data:0x00000484; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_390_bss_8 = .bss:0x00000008; // type:object size:0x50 data:4byte -lbl_390_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_390_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_390_bss_D8 = .bss:0x000000D8; // type:object size:0x30 data:4byte +AcOwaterSurface__STATE_MOVE = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOwaterSurface__STATE_AFTER_1 = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOwaterSurface__STATE_AFTER_2 = .bss:0x000000D8; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_waterfall_D100NP/symbols.txt b/config/SOUE01/rels/d_a_obj_waterfall_D100NP/symbols.txt index 8e64d254..3d418f91 100644 --- a/config/SOUE01/rels/d_a_obj_waterfall_D100NP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_waterfall_D100NP/symbols.txt @@ -58,7 +58,7 @@ lbl_422_data_30 = .data:0x00000030; // type:object size:0x10 data:string g_profile_OBJ_WATERFALL_D100 = .data:0x00000040; // type:object size:0x10 lbl_422_data_50 = .data:0x00000050; // type:object size:0x10 lbl_422_data_60 = .data:0x00000060; // type:object size:0x28 -lbl_422_data_88 = .data:0x00000088; // type:object size:0x80 +AcOwaterfallD100__vtable = .data:0x00000088; // type:object size:0x80 lbl_422_data_108 = .data:0x00000108; // type:object size:0x30 lbl_422_data_138 = .data:0x00000138; // type:object size:0x30 lbl_422_data_168 = .data:0x00000168; // type:object size:0x18 @@ -66,6 +66,6 @@ lbl_422_data_180 = .data:0x00000180; // type:object size:0xF0 lbl_422_data_270 = .data:0x00000270; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_422_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_422_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_422_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_422_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +AcOwaterfallD100__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOwaterfallD100__STATE_SPOUT = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOwaterfallD100__STATE_AFTER = .bss:0x00000098; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_waterfall_D101NP/symbols.txt b/config/SOUE01/rels/d_a_obj_waterfall_D101NP/symbols.txt index 964b2782..393fea7d 100644 --- a/config/SOUE01/rels/d_a_obj_waterfall_D101NP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_waterfall_D101NP/symbols.txt @@ -60,7 +60,7 @@ g_profile_OBJ_WATERFALL_D101 = .data:0x00000000; // type:object size:0x10 data:4 lbl_321_data_10 = .data:0x00000010; // type:object size:0x88 data:float lbl_321_data_98 = .data:0x00000098; // type:object size:0x24 lbl_321_data_BC = .data:0x000000BC; // type:object size:0x24 -lbl_321_data_E0 = .data:0x000000E0; // type:object size:0x80 +AcOWaterFallD101__vtable = .data:0x000000E0; // type:object size:0x80 lbl_321_data_160 = .data:0x00000160; // type:object size:0x30 lbl_321_data_190 = .data:0x00000190; // type:object size:0x30 lbl_321_data_1C0 = .data:0x000001C0; // type:object size:0x18 @@ -68,4 +68,4 @@ lbl_321_data_1D8 = .data:0x000001D8; // type:object size:0x80 lbl_321_data_258 = .data:0x00000258; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_321_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_321_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcOWaterFallD101__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_wind02NP/symbols.txt b/config/SOUE01/rels/d_a_obj_wind02NP/symbols.txt index c8c2c738..98ac9bad 100644 --- a/config/SOUE01/rels/d_a_obj_wind02NP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_wind02NP/symbols.txt @@ -81,7 +81,7 @@ lbl_161_data_C8 = .data:0x000000C8; // type:object size:0x50 lbl_161_data_118 = .data:0x00000118; // type:object size:0x1C lbl_161_data_134 = .data:0x00000134; // type:object size:0x8 lbl_161_data_13C = .data:0x0000013C; // type:object size:0xC -lbl_161_data_148 = .data:0x00000148; // type:object size:0x80 +AcOwind02__vtable = .data:0x00000148; // type:object size:0x80 lbl_161_data_1C8 = .data:0x000001C8; // type:object size:0x30 lbl_161_data_1F8 = .data:0x000001F8; // type:object size:0x30 lbl_161_data_228 = .data:0x00000228; // type:object size:0x18 @@ -91,7 +91,7 @@ lbl_161_data_2C8 = .data:0x000002C8; // type:object size:0x170 lbl_161_data_438 = .data:0x00000438; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_161_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_161_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_161_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_161_bss_98 = .bss:0x00000098; // type:object size:0x70 data:4byte -lbl_161_bss_108 = .bss:0x00000108; // type:object size:0x4 data:4byte +AcOwind02__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOwind02__STATE_LOOP = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOwind02__STATE_STOP = .bss:0x00000098; // type:object size:0x70 data:4byte +NUM_LAVA_PILLARS = .bss:0x00000108; // type:object size:0x4 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_wind03NP/symbols.txt b/config/SOUE01/rels/d_a_obj_wind03NP/symbols.txt index 6f767aa5..ada6a85e 100644 --- a/config/SOUE01/rels/d_a_obj_wind03NP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_wind03NP/symbols.txt @@ -66,7 +66,7 @@ g_profile_OBJ_WIND03 = .data:0x00000000; // type:object size:0x98 data:4byte lbl_162_data_98 = .data:0x00000098; // type:object size:0x4 data:4byte lbl_162_data_9C = .data:0x0000009C; // type:object size:0x24 lbl_162_data_C0 = .data:0x000000C0; // type:object size:0x8 -lbl_162_data_C8 = .data:0x000000C8; // type:object size:0x80 +AcOwind03__vtable = .data:0x000000C8; // type:object size:0x80 lbl_162_data_148 = .data:0x00000148; // type:object size:0x30 lbl_162_data_178 = .data:0x00000178; // type:object size:0x30 lbl_162_data_1A8 = .data:0x000001A8; // type:object size:0x18 @@ -76,6 +76,6 @@ lbl_162_data_248 = .data:0x00000248; // type:object size:0xBC lbl_162_data_304 = .data:0x00000304; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_162_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_162_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcOwind03__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte lbl_162_bss_48 = .bss:0x00000048; // type:object size:0x1 data:byte lbl_162_bss_4C = .bss:0x0000004C; // type:object size:0xC data:float diff --git a/config/SOUE01/rels/d_a_obj_wind04NP/symbols.txt b/config/SOUE01/rels/d_a_obj_wind04NP/symbols.txt index 13b3018b..5da2cb7e 100644 --- a/config/SOUE01/rels/d_a_obj_wind04NP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_wind04NP/symbols.txt @@ -74,7 +74,7 @@ lbl_163_data_90 = .data:0x00000090; // type:object size:0x1C lbl_163_data_AC = .data:0x000000AC; // type:object size:0x8 lbl_163_data_B4 = .data:0x000000B4; // type:object size:0xC lbl_163_data_C0 = .data:0x000000C0; // type:object size:0x8 data:string -lbl_163_data_C8 = .data:0x000000C8; // type:object size:0x80 +AcOwind04__vtable = .data:0x000000C8; // type:object size:0x80 lbl_163_data_148 = .data:0x00000148; // type:object size:0x30 lbl_163_data_178 = .data:0x00000178; // type:object size:0x30 lbl_163_data_1A8 = .data:0x000001A8; // type:object size:0x18 diff --git a/config/SOUE01/rels/d_a_obj_windNP/symbols.txt b/config/SOUE01/rels/d_a_obj_windNP/symbols.txt index f2338cbb..20c4bc1b 100644 --- a/config/SOUE01/rels/d_a_obj_windNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_windNP/symbols.txt @@ -57,7 +57,7 @@ lbl_160_rodata_AC = .rodata:0x000000AC; // type:object size:0x20 data:float g_profile_OBJ_WIND = .data:0x00000000; // type:object size:0x3C data:4byte lbl_160_data_3C = .data:0x0000003C; // type:object size:0xC lbl_160_data_48 = .data:0x00000048; // type:object size:0x30 -lbl_160_data_78 = .data:0x00000078; // type:object size:0x80 +AcOwind__vtable = .data:0x00000078; // type:object size:0x80 lbl_160_data_F8 = .data:0x000000F8; // type:object size:0x30 lbl_160_data_128 = .data:0x00000128; // type:object size:0x30 lbl_160_data_158 = .data:0x00000158; // type:object size:0x18 @@ -67,4 +67,4 @@ lbl_160_data_1F8 = .data:0x000001F8; // type:object size:0xB0 lbl_160_data_2A8 = .data:0x000002A8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_160_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_160_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +AcOwind__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_windmillNP/symbols.txt b/config/SOUE01/rels/d_a_obj_windmillNP/symbols.txt index 6878dfd6..46874397 100644 --- a/config/SOUE01/rels/d_a_obj_windmillNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_windmillNP/symbols.txt @@ -69,10 +69,10 @@ lbl_374_rodata_4C = .rodata:0x0000004C; // type:object size:0x4 data:float lbl_374_rodata_50 = .rodata:0x00000050; // type:object size:0xC g_profile_OBJ_WINDMILL = .data:0x00000000; // type:object size:0x6C data:4byte lbl_374_data_6C = .data:0x0000006C; // type:object size:0x1C data:string -lbl_374_data_88 = .data:0x00000088; // type:object size:0x4 data:4byte +rotationIncremenst = .data:0x00000088; // type:object size:0x4 data:4byte lbl_374_data_8C = .data:0x0000008C; // type:object size:0x4 data:4byte lbl_374_data_90 = .data:0x00000090; // type:object size:0x8 data:4byte -lbl_374_data_98 = .data:0x00000098; // type:object size:0x80 +AcOwindmill__vtable = .data:0x00000098; // type:object size:0x80 lbl_374_data_118 = .data:0x00000118; // type:object size:0x30 lbl_374_data_148 = .data:0x00000148; // type:object size:0x30 lbl_374_data_178 = .data:0x00000178; // type:object size:0x18 @@ -80,7 +80,7 @@ lbl_374_data_190 = .data:0x00000190; // type:object size:0x198 lbl_374_data_328 = .data:0x00000328; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_374_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_374_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_374_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_374_bss_98 = .bss:0x00000098; // type:object size:0x80 data:4byte -lbl_374_bss_118 = .bss:0x00000118; // type:object size:0x30 data:4byte +AcOwindmill__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOwindmill__STATE_CAMERA_MOVE = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOwindmill__STATE_MOVE = .bss:0x00000098; // type:object size:0x80 data:4byte +AcOwindmill__STATE_COLLECT_STICK = .bss:0x00000118; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_windmill_desertNP/symbols.txt b/config/SOUE01/rels/d_a_obj_windmill_desertNP/symbols.txt index 116b075f..4790d7e2 100644 --- a/config/SOUE01/rels/d_a_obj_windmill_desertNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_windmill_desertNP/symbols.txt @@ -66,10 +66,10 @@ lbl_420_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 data:float lbl_420_rodata_20 = .rodata:0x00000020; // type:object size:0x4 data:float lbl_420_rodata_24 = .rodata:0x00000024; // type:object size:0x4 data:float g_profile_OBJ_WINDMILL_DESERT = .data:0x00000000; // type:object size:0x10 data:4byte -lbl_420_data_10 = .data:0x00000010; // type:object size:0x2C +AcOwindmillDesert__colliderInit = .data:0x00000010; // type:object size:0x2C lbl_420_data_3C = .data:0x0000003C; // type:object size:0x80 lbl_420_data_BC = .data:0x000000BC; // type:object size:0x24 -lbl_420_data_E0 = .data:0x000000E0; // type:object size:0x80 +AcOwindmillDesert__vtable = .data:0x000000E0; // type:object size:0x80 lbl_420_data_160 = .data:0x00000160; // type:object size:0x30 lbl_420_data_190 = .data:0x00000190; // type:object size:0x30 lbl_420_data_1C0 = .data:0x000001C0; // type:object size:0x18 @@ -78,7 +78,7 @@ lbl_420_data_1F0 = .data:0x000001F0; // type:object size:0x170 lbl_420_data_360 = .data:0x00000360; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_420_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_420_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_420_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_420_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_420_bss_D8 = .bss:0x000000D8; // type:object size:0x30 data:4byte +AcOwindmillDesert__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOwindmillDesert__STATE_ACCELERATION = .bss:0x00000058; // type:object size:0x40 data:4byte +AcOwindmillDesert__STATE_ROLL_MAX_SPEED = .bss:0x00000098; // type:object size:0x40 data:4byte +AcOwindmillDesert__STATE_DECELERATION = .bss:0x000000D8; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_obj_wood_boardNP/symbols.txt b/config/SOUE01/rels/d_a_obj_wood_boardNP/symbols.txt index ec1abebd..39adca2d 100644 --- a/config/SOUE01/rels/d_a_obj_wood_boardNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_wood_boardNP/symbols.txt @@ -58,7 +58,7 @@ g_profile_OBJ_WOOD_BOARD = .data:0x00000060; // type:object size:0x10 lbl_339_data_70 = .data:0x00000070; // type:object size:0x64 lbl_339_data_D4 = .data:0x000000D4; // type:object size:0x20 lbl_339_data_F4 = .data:0x000000F4; // type:object size:0x4 data:4byte -lbl_339_data_F8 = .data:0x000000F8; // type:object size:0x80 +AcOwoodBoard__vtable = .data:0x000000F8; // type:object size:0x80 lbl_339_data_178 = .data:0x00000178; // type:object size:0x30 lbl_339_data_1A8 = .data:0x000001A8; // type:object size:0x30 lbl_339_data_1D8 = .data:0x000001D8; // type:object size:0x18 @@ -66,5 +66,5 @@ lbl_339_data_1F0 = .data:0x000001F0; // type:object size:0xA0 lbl_339_data_290 = .data:0x00000290; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_339_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_339_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_339_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcOwoodBoard__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcOwoodBoard__STATE_BREAK = .bss:0x00000058; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_a_shop_sampleNP/symbols.txt b/config/SOUE01/rels/d_a_shop_sampleNP/symbols.txt index 79dcab2e..60a9ae8a 100644 --- a/config/SOUE01/rels/d_a_shop_sampleNP/symbols.txt +++ b/config/SOUE01/rels/d_a_shop_sampleNP/symbols.txt @@ -215,19 +215,19 @@ lbl_111_rodata_10 = .rodata:0x00000010; // type:object size:0x4 data:float lbl_111_rodata_14 = .rodata:0x00000014; // type:object size:0x34 data:float lbl_111_rodata_48 = .rodata:0x00000048; // type:object size:0x6C data:float lbl_111_rodata_B4 = .rodata:0x000000B4; // type:object size:0x60 data:float -lbl_111_data_0 = .data:0x00000000; // type:object size:0x54 data:4byte -lbl_111_data_54 = .data:0x00000054; // type:object size:0xBA4 +AcOShopSample__SOLD_OUT = .data:0x00000000; // type:object size:0x54 data:4byte +AcOShopSample__SHOP_ITEMS = .data:0x00000054; // type:object size:0xBA4 g_profile_SHOP_SAMPLE = .data:0x00000BF8; // type:object size:0x10 lbl_111_data_C08 = .data:0x00000C08; // type:object size:0x24 lbl_111_data_C2C = .data:0x00000C2C; // type:object size:0x14 lbl_111_data_C40 = .data:0x00000C40; // type:object size:0x4 data:4byte lbl_111_data_C44 = .data:0x00000C44; // type:object size:0x18 lbl_111_data_C5C = .data:0x00000C5C; // type:object size:0x24 -lbl_111_data_C80 = .data:0x00000C80; // type:object size:0x30 data:float +SHOP_SELECT_ITEM_DEF = .data:0x00000C80; // type:object size:0x30 data:float lbl_111_data_CB0 = .data:0x00000CB0; // type:object size:0x90 data:float -lbl_111_data_D40 = .data:0x00000D40; // type:object size:0x30 data:float +SHOP_BOTTLE_INTERACTION = .data:0x00000D40; // type:object size:0x30 data:float lbl_111_data_D70 = .data:0x00000D70; // type:object size:0x30 data:float -lbl_111_data_DA0 = .data:0x00000DA0; // type:object size:0x80 +AcOShopSample__vtable = .data:0x00000DA0; // type:object size:0x80 lbl_111_data_E20 = .data:0x00000E20; // type:object size:0x30 lbl_111_data_E50 = .data:0x00000E50; // type:object size:0x30 lbl_111_data_E80 = .data:0x00000E80; // type:object size:0x18 @@ -243,31 +243,31 @@ lbl_111_data_F68 = .data:0x00000F68; // type:object size:0xC lbl_111_data_F74 = .data:0x00000F74; // type:object size:0xC lbl_111_data_F80 = .data:0x00000F80; // type:object size:0xC lbl_111_data_F8C = .data:0x00000F8C; // type:object size:0xC -lbl_111_data_F98 = .data:0x00000F98; // type:object size:0x40 -lbl_111_data_FD8 = .data:0x00000FD8; // type:object size:0x40 -lbl_111_data_1018 = .data:0x00001018; // type:object size:0x40 -lbl_111_data_1058 = .data:0x00001058; // type:object size:0x40 -lbl_111_data_1098 = .data:0x00001098; // type:object size:0x40 +SHOP_SOLD_OUT__vtable = .data:0x00000F98; // type:object size:0x40 +SHOP_BOTTLE_ITEM__vtable = .data:0x00000FD8; // type:object size:0x40 +SHOP_HEART_MEDAL__vtable = .data:0x00001018; // type:object size:0x40 +SHOP_HEART_PIECE__vtable = .data:0x00001058; // type:object size:0x40 +SHOP_EXTRA_WALLET__vtable = .data:0x00001098; // type:object size:0x40 lbl_111_data_10D8 = .data:0x000010D8; // type:object size:0x40 lbl_111_data_1118 = .data:0x00001118; // type:object size:0x40 -lbl_111_data_1158 = .data:0x00001158; // type:object size:0x40 -lbl_111_data_1198 = .data:0x00001198; // type:object size:0x40 -lbl_111_data_11D8 = .data:0x000011D8; // type:object size:0x80 -lbl_111_data_1258 = .data:0x00001258; // type:object size:0x40 -lbl_111_data_1298 = .data:0x00001298; // type:object size:0x40 -lbl_111_data_12D8 = .data:0x000012D8; // type:object size:0x40 -lbl_111_data_1318 = .data:0x00001318; // type:object size:0x40 -lbl_111_data_1358 = .data:0x00001358; // type:object size:0x40 -lbl_111_data_1398 = .data:0x00001398; // type:object size:0x80 +SHOP_EXTRA_POUCH_3__vtable = .data:0x00001158; // type:object size:0x40 +SHOP_EXTRA_POUCH_2__vtable = .data:0x00001198; // type:object size:0x40 +SHOP_EXTRA_POUCH_1__vtable = .data:0x000011D8; // type:object size:0x80 +SHOP_BUG_NET__vtable = .data:0x00001258; // type:object size:0x40 +SHOP_10_DEKU_SEEDS__vtable = .data:0x00001298; // type:object size:0x40 +SHOP_10_BOMBS__vtable = .data:0x000012D8; // type:object size:0x40 +SHOP_10_ARROWS__vtable = .data:0x00001318; // type:object size:0x40 +SHOP_OTHER__vtable = .data:0x00001358; // type:object size:0x40 +SHOP_SOLD_OUT_NEXT__vtable = .data:0x00001398; // type:object size:0x80 lbl_111_data_1418 = .data:0x00001418; // type:object size:0x128 lbl_111_data_1540 = .data:0x00001540; // type:object size:0x48 lbl_111_data_1588 = .data:0x00001588; // type:object size:0x10 lbl_111_data_1598 = .data:0x00001598; // type:object size:0x4 data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_111_bss_8 = .bss:0x00000008; // type:object size:0x10 data:float -lbl_111_bss_18 = .bss:0x00000018; // type:object size:0x80 data:4byte -lbl_111_bss_98 = .bss:0x00000098; // type:object size:0x70 data:4byte -lbl_111_bss_108 = .bss:0x00000108; // type:object size:0xC data:float +AcOShopSample__STATE_WAIT = .bss:0x00000018; // type:object size:0x80 data:4byte +AcOShopSample__STATE_PICKING_UP = .bss:0x00000098; // type:object size:0x70 data:4byte +AcOShopSample__DEFAULT_SCALE = .bss:0x00000108; // type:object size:0xC data:float lbl_111_bss_114 = .bss:0x00000114; // type:object size:0x1 data:byte lbl_111_bss_118 = .bss:0x00000118; // type:object size:0x10 data:float lbl_111_bss_128 = .bss:0x00000128; // type:object size:0x1 data:byte diff --git a/config/SOUE01/rels/d_a_t_wood_areaNP/symbols.txt b/config/SOUE01/rels/d_a_t_wood_areaNP/symbols.txt index 7f14ff99..f5c75b97 100644 --- a/config/SOUE01/rels/d_a_t_wood_areaNP/symbols.txt +++ b/config/SOUE01/rels/d_a_t_wood_areaNP/symbols.txt @@ -62,5 +62,5 @@ __vt__27sFState_c<14dAcTWoodArea_c> = .data:0x00000108; // type:object size:0x18 __vt__29sFStateID_c<14dAcTWoodArea_c> = .data:0x000001A8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_329_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_329_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_329_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +AcTWoodArea__STATE_INIT = .bss:0x00000018; // type:object size:0x40 data:4byte +AcTWoodArea__STATE_WAIT = .bss:0x00000058; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_lyt_file_selectNP/symbols.txt b/config/SOUE01/rels/d_lyt_file_selectNP/symbols.txt index 69f7112f..09909709 100644 --- a/config/SOUE01/rels/d_lyt_file_selectNP/symbols.txt +++ b/config/SOUE01/rels/d_lyt_file_selectNP/symbols.txt @@ -193,7 +193,7 @@ lbl_557_rodata_B8 = .rodata:0x000000B8; // type:object size:0x8 data:double lbl_557_rodata_C0 = .rodata:0x000000C0; // type:object size:0x8 data:4byte lbl_557_rodata_C8 = .rodata:0x000000C8; // type:object size:0x400 data:4byte lbl_557_rodata_4C8 = .rodata:0x000004C8; // type:object size:0x60 data:float -lbl_557_rodata_528 = .rodata:0x00000528; // type:object size:0x90 data:2byte +PROGRESS_MSG_STORYFLAGS = .rodata:0x00000528; // type:object size:0x90 data:2byte g_profile_LYT_FILESELECT = .data:0x00000000; // type:object size:0xC data:4byte lbl_557_data_C = .data:0x0000000C; // type:object size:0xC lbl_557_data_18 = .data:0x00000018; // type:object size:0x4 @@ -391,7 +391,7 @@ lbl_557_data_1100 = .data:0x00001100; // type:object size:0x10 data:string lbl_557_data_1110 = .data:0x00001110; // type:object size:0x10 data:string lbl_557_data_1120 = .data:0x00001120; // type:object size:0x10 data:string lbl_557_data_1130 = .data:0x00001130; // type:object size:0x10 data:string -lbl_557_data_1140 = .data:0x00001140; // type:object size:0x110 +PROGRESS_MESSAGES = .data:0x00001140; // type:object size:0x110 lbl_557_data_1250 = .data:0x00001250; // type:object size:0xC lbl_557_data_125C = .data:0x0000125C; // type:object size:0xC lbl_557_data_1268 = .data:0x00001268; // type:object size:0x30 @@ -400,7 +400,7 @@ lbl_557_data_12C8 = .data:0x000012C8; // type:object size:0x18 lbl_557_data_12E0 = .data:0x000012E0; // type:object size:0x18 lbl_557_data_12F8 = .data:0x000012F8; // type:object size:0x34 lbl_557_data_132C = .data:0x0000132C; // type:object size:0x34 -lbl_557_data_1360 = .data:0x00001360; // type:object size:0x50 +LytFileSelectMgr__vtable = .data:0x00001360; // type:object size:0x50 lbl_557_data_13B0 = .data:0x000013B0; // type:object size:0x30 lbl_557_data_13E0 = .data:0x000013E0; // type:object size:0x30 lbl_557_data_1410 = .data:0x00001410; // type:object size:0x18 @@ -412,12 +412,12 @@ lbl_557_data_14B8 = .data:0x000014B8; // type:object size:0x56C lbl_557_data_1A24 = .data:0x00001A24; // type:object size:0x34 lbl_557_data_1A58 = .data:0x00001A58; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_557_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_557_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_557_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_557_bss_98 = .bss:0x00000098; // type:object size:0xC0 data:4byte -lbl_557_bss_158 = .bss:0x00000158; // type:object size:0x100 data:4byte -lbl_557_bss_258 = .bss:0x00000258; // type:object size:0x40 data:4byte -lbl_557_bss_298 = .bss:0x00000298; // type:object size:0x40 data:4byte -lbl_557_bss_2D8 = .bss:0x000002D8; // type:object size:0xC0 data:4byte -lbl_557_bss_398 = .bss:0x00000398; // type:object size:0xF0 data:4byte +LYT_FILE_SELECT_MGR = .bss:0x00000008; // type:object size:0x10 data:4byte +LytFileSelectMgr__StateID_Init = .bss:0x00000018; // type:object size:0x40 data:4byte +LytFileSelectMgr__StateID_In = .bss:0x00000058; // type:object size:0x40 data:4byte +LytFileSelectMgr__StateID_FileSelect = .bss:0x00000098; // type:object size:0xC0 data:4byte +LytFileSelectMgr__StateID_ContentSelect = .bss:0x00000158; // type:object size:0x100 data:4byte +LytFileSelectMain__StateID_Init = .bss:0x00000258; // type:object size:0x40 data:4byte +LytFileSelectMain__StateID_FileIn = .bss:0x00000298; // type:object size:0x40 data:4byte +LytFileSelectMain__StateID_FileSelect = .bss:0x000002D8; // type:object size:0xC0 data:4byte +LytFileSelectMain__StateID_ContentSelect = .bss:0x00000398; // type:object size:0xF0 data:4byte diff --git a/config/SOUE01/rels/d_lyt_seeker_stoneNP/symbols.txt b/config/SOUE01/rels/d_lyt_seeker_stoneNP/symbols.txt index 1837f04d..47613fc6 100644 --- a/config/SOUE01/rels/d_lyt_seeker_stoneNP/symbols.txt +++ b/config/SOUE01/rels/d_lyt_seeker_stoneNP/symbols.txt @@ -155,7 +155,7 @@ lbl_635_data_440 = .data:0x00000440; // type:object size:0xC data:string lbl_635_data_44C = .data:0x0000044C; // type:object size:0x50 lbl_635_data_49C = .data:0x0000049C; // type:object size:0x20 jumptable_635_data_4BC = .data:0x000004BC; // type:object size:0x24 scope:local -lbl_635_data_558 = .data:0x00000558; // type:object size:0x50 +LytSeekerStone__vtable = .data:0x00000558; // type:object size:0x50 lbl_635_data_5A8 = .data:0x000005A8; // type:object size:0x30 lbl_635_data_5D8 = .data:0x000005D8; // type:object size:0x30 lbl_635_data_608 = .data:0x00000608; // type:object size:0x18 @@ -166,14 +166,14 @@ lbl_635_data_660 = .data:0x00000660; // type:object size:0x378 lbl_635_data_9D8 = .data:0x000009D8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_635_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_635_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_635_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_635_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_635_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_635_bss_118 = .bss:0x00000118; // type:object size:0xC0 data:4byte -lbl_635_bss_1D8 = .bss:0x000001D8; // type:object size:0x40 data:4byte -lbl_635_bss_218 = .bss:0x00000218; // type:object size:0x40 data:4byte -lbl_635_bss_258 = .bss:0x00000258; // type:object size:0x40 data:4byte -lbl_635_bss_298 = .bss:0x00000298; // type:object size:0x70 data:4byte -lbl_635_bss_308 = .bss:0x00000308; // type:object size:0x8 data:4byte +LytSeekerStone__StateID_None = .bss:0x00000018; // type:object size:0x40 data:4byte +LytSeekerStone__StateID_In = .bss:0x00000058; // type:object size:0x40 data:4byte +LytSeekerStone__StateID_Move = .bss:0x00000098; // type:object size:0x40 data:4byte +LytSeekerStone__StateID_Decide = .bss:0x000000D8; // type:object size:0x40 data:4byte +LytSeekerStone__StateID_SelectScroll = .bss:0x00000118; // type:object size:0xC0 data:4byte +LytSeekerStone__StateID_FadeIn = .bss:0x000001D8; // type:object size:0x40 data:4byte +LytSeekerStone__StateID_Movie = .bss:0x00000218; // type:object size:0x40 data:4byte +LytSeekerStone__StateID_MovieFadeOut = .bss:0x00000258; // type:object size:0x40 data:4byte +LytSeekerStone__StateID_MovieFadeIn = .bss:0x00000298; // type:object size:0x70 data:4byte +LytSeekerStone__sInstance = .bss:0x00000308; // type:object size:0x8 data:4byte lbl_635_bss_310 = .bss:0x00000310; // type:object size:0x10 data:2byte diff --git a/config/SOUE01/rels/d_lyt_title_BGNP/symbols.txt b/config/SOUE01/rels/d_lyt_title_BGNP/symbols.txt index ab98ff6a..a5304657 100644 --- a/config/SOUE01/rels/d_lyt_title_BGNP/symbols.txt +++ b/config/SOUE01/rels/d_lyt_title_BGNP/symbols.txt @@ -70,4 +70,4 @@ lbl_558_data_128 = .data:0x00000128; // type:object size:0xC lbl_558_data_134 = .data:0x00000134; // type:object size:0x40 lbl_558_data_174 = .data:0x00000174; // type:object size:0x1C lbl_558_data_190 = .data:0x00000190; // type:object size:0x14 -lbl_558_bss_8 = .bss:0x00000008; // type:object size:0x4 data:4byte +LYT_TITLE_BG = .bss:0x00000008; // type:object size:0x4 data:4byte diff --git a/config/SOUE01/rels/d_s_bootNP/symbols.txt b/config/SOUE01/rels/d_s_bootNP/symbols.txt index bb248aeb..b2de6205 100644 --- a/config/SOUE01/rels/d_s_bootNP/symbols.txt +++ b/config/SOUE01/rels/d_s_bootNP/symbols.txt @@ -185,7 +185,7 @@ lbl_3_data_560 = .data:0x00000560; // type:object size:0x8 lbl_3_data_568 = .data:0x00000568; // type:object size:0x22C g_profile_BOOT = .data:0x00000794; // type:object size:0x50 lbl_3_data_7E4 = .data:0x000007E4; // type:object size:0x4 -lbl_3_data_7E8 = .data:0x000007E8; // type:object size:0x50 +ScBoot__vtable = .data:0x000007E8; // type:object size:0x50 lbl_3_data_838 = .data:0x00000838; // type:object size:0x30 lbl_3_data_868 = .data:0x00000868; // type:object size:0x30 lbl_3_data_898 = .data:0x00000898; // type:object size:0x18 @@ -195,7 +195,7 @@ lbl_3_data_8EC = .data:0x000008EC; // type:object size:0x10C lbl_3_data_9F8 = .data:0x000009F8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_3_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_3_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_3_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_3_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_3_bss_D8 = .bss:0x000000D8; // type:object size:0x30 data:4byte +ScBoot__STATE_INIT = .bss:0x00000018; // type:object size:0x40 data:4byte +ScBoot__STATE_STRAP = .bss:0x00000058; // type:object size:0x40 data:4byte +ScBoot__STATE_CONNECT = .bss:0x00000098; // type:object size:0x40 data:4byte +ScBoot__STATE_SAVE = .bss:0x000000D8; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_t_D3_scene_changeNP/symbols.txt b/config/SOUE01/rels/d_t_D3_scene_changeNP/symbols.txt index 71b44dfe..0723aeb6 100644 --- a/config/SOUE01/rels/d_t_D3_scene_changeNP/symbols.txt +++ b/config/SOUE01/rels/d_t_D3_scene_changeNP/symbols.txt @@ -20,9 +20,9 @@ lbl_600_data_20 = .data:0x00000020; // type:object size:0x8 lbl_600_data_28 = .data:0x00000028; // type:object size:0x8 lbl_600_data_30 = .data:0x00000030; // type:object size:0x8 lbl_600_data_38 = .data:0x00000038; // type:object size:0x8 -lbl_600_data_40 = .data:0x00000040; // type:object size:0x20 data:4byte +TgD3SceneChange__D3StageNames = .data:0x00000040; // type:object size:0x20 data:4byte lbl_600_data_60 = .data:0x00000060; // type:object size:0x8 lbl_600_data_68 = .data:0x00000068; // type:object size:0x8 data:4byte g_profile_TAG_D3_SCENE_CHANGE = .data:0x00000070; // type:object size:0x10 jumptable_600_data_80 = .data:0x00000080; // type:object size:0x24 scope:local -lbl_600_data_A4 = .data:0x000000A4; // type:object size:0x74 +TgD3SceneChange__vtable = .data:0x000000A4; // type:object size:0x74 diff --git a/config/SOUE01/rels/d_t_actionNP/symbols.txt b/config/SOUE01/rels/d_t_actionNP/symbols.txt index 39601b42..06a7db44 100644 --- a/config/SOUE01/rels/d_t_actionNP/symbols.txt +++ b/config/SOUE01/rels/d_t_actionNP/symbols.txt @@ -17,4 +17,4 @@ lbl_202_rodata_8 = .rodata:0x00000008; // type:object size:0x4 data:float lbl_202_rodata_C = .rodata:0x0000000C; // type:object size:0x4 data:float g_profile_ACTION_TAG = .data:0x00000000; // type:object size:0x10 lbl_202_data_10 = .data:0x00000010; // type:object size:0x4 data:4byte -lbl_202_data_14 = .data:0x00000014; // type:object size:0x74 +TgActTag__vtable = .data:0x00000014; // type:object size:0x74 diff --git a/config/SOUE01/rels/d_t_auto_messageNP/symbols.txt b/config/SOUE01/rels/d_t_auto_messageNP/symbols.txt index 38cb287f..c6047ffe 100644 --- a/config/SOUE01/rels/d_t_auto_messageNP/symbols.txt +++ b/config/SOUE01/rels/d_t_auto_messageNP/symbols.txt @@ -13,4 +13,4 @@ _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global lbl_439_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float g_profile_TAG_AUTO_MESSAGE = .data:0x00000000; // type:object size:0x10 -lbl_439_data_10 = .data:0x00000010; // type:object size:0x74 +TgAutoMessage__vtable = .data:0x00000010; // type:object size:0x74 diff --git a/config/SOUE01/rels/d_t_barrelNP/symbols.txt b/config/SOUE01/rels/d_t_barrelNP/symbols.txt index 57447bef..a56a2e20 100644 --- a/config/SOUE01/rels/d_t_barrelNP/symbols.txt +++ b/config/SOUE01/rels/d_t_barrelNP/symbols.txt @@ -52,7 +52,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global lbl_442_rodata_0 = .rodata:0x00000000; // type:object size:0x14 data:float g_profile_TAG_BARREL = .data:0x00000000; // type:object size:0x10 data:4byte -lbl_442_data_10 = .data:0x00000010; // type:object size:0x78 +TgBarrel__vtable = .data:0x00000010; // type:object size:0x78 lbl_442_data_88 = .data:0x00000088; // type:object size:0x30 lbl_442_data_B8 = .data:0x000000B8; // type:object size:0x30 lbl_442_data_E8 = .data:0x000000E8; // type:object size:0x18 @@ -60,5 +60,5 @@ lbl_442_data_100 = .data:0x00000100; // type:object size:0x10C lbl_442_data_20C = .data:0x0000020C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_442_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_442_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_442_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +TgBarrel__StateID_Wait = .bss:0x00000018; // type:object size:0x40 data:4byte +TgBarrel__StateID_Stop = .bss:0x00000058; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_t_beetleNP/symbols.txt b/config/SOUE01/rels/d_t_beetleNP/symbols.txt index e9636ea2..9fed4ab2 100644 --- a/config/SOUE01/rels/d_t_beetleNP/symbols.txt +++ b/config/SOUE01/rels/d_t_beetleNP/symbols.txt @@ -14,9 +14,9 @@ __dt__11dTgBeetle_cFv = .text:0x00000680; // type:function size:0x5C _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global lbl_302_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float -lbl_302_rodata_4 = .rodata:0x00000004; // type:object size:0x4 data:float -lbl_302_rodata_8 = .rodata:0x00000008; // type:object size:0x4 data:float -lbl_302_rodata_C = .rodata:0x0000000C; // type:object size:0xC data:float +dTgBeetle__scaleMultiplier = .rodata:0x00000004; // type:object size:0x4 data:float +lbl_302_rodata_4.y = .rodata:0x00000008; // type:object size:0x4 data:float +lbl_302_rodata_4.z = .rodata:0x0000000C; // type:object size:0xC data:float g_profile_BEETLE_TAG = .data:0x00000000; // type:object size:0x10 lbl_302_data_10 = .data:0x00000010; // type:object size:0x8 -lbl_302_data_18 = .data:0x00000018; // type:object size:0x74 +dTgBeetle__vtable = .data:0x00000018; // type:object size:0x74 diff --git a/config/SOUE01/rels/d_t_belt_obstacleNP/symbols.txt b/config/SOUE01/rels/d_t_belt_obstacleNP/symbols.txt index a0872e7e..8060766e 100644 --- a/config/SOUE01/rels/d_t_belt_obstacleNP/symbols.txt +++ b/config/SOUE01/rels/d_t_belt_obstacleNP/symbols.txt @@ -16,4 +16,4 @@ lbl_446_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float lbl_446_rodata_4 = .rodata:0x00000004; // type:object size:0x4 data:float lbl_446_rodata_8 = .rodata:0x00000008; // type:object size:0x4 data:float g_profile_TAG_BELT_OBSTACLE = .data:0x00000000; // type:object size:0x10 -lbl_446_data_10 = .data:0x00000010; // type:object size:0x74 +TgBeltObstacle__vtable = .data:0x00000010; // type:object size:0x74 diff --git a/config/SOUE01/rels/d_t_clef_managerNP/symbols.txt b/config/SOUE01/rels/d_t_clef_managerNP/symbols.txt index 8b0e22e4..dbf68ed2 100644 --- a/config/SOUE01/rels/d_t_clef_managerNP/symbols.txt +++ b/config/SOUE01/rels/d_t_clef_managerNP/symbols.txt @@ -14,4 +14,4 @@ _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global lbl_547_rodata_0 = .rodata:0x00000000; // type:object size:0x24 g_profile_TAG_CLEF_MANAGER = .data:0x00000000; // type:object size:0x10 -lbl_547_data_10 = .data:0x00000010; // type:object size:0x74 +vtable = .data:0x00000010; // type:object size:0x74 diff --git a/config/SOUE01/rels/d_t_dungeon_startNP/symbols.txt b/config/SOUE01/rels/d_t_dungeon_startNP/symbols.txt index f34e7dc9..d267f4a5 100644 --- a/config/SOUE01/rels/d_t_dungeon_startNP/symbols.txt +++ b/config/SOUE01/rels/d_t_dungeon_startNP/symbols.txt @@ -15,4 +15,4 @@ lbl_566_rodata_0 = .rodata:0x00000000; // type:object size:0x1C data:float g_profile_START_TAG = .data:0x00000000; // type:object size:0x10 lbl_566_data_10 = .data:0x00000010; // type:object size:0xC lbl_566_data_1C = .data:0x0000001C; // type:object size:0x24 -lbl_566_data_40 = .data:0x00000040; // type:object size:0x80 +AcDungeonStartTag__vtable = .data:0x00000040; // type:object size:0x80 diff --git a/config/SOUE01/rels/d_t_effect_genNP/symbols.txt b/config/SOUE01/rels/d_t_effect_genNP/symbols.txt index caf7ae32..02ba191a 100644 --- a/config/SOUE01/rels/d_t_effect_genNP/symbols.txt +++ b/config/SOUE01/rels/d_t_effect_genNP/symbols.txt @@ -15,5 +15,5 @@ lbl_303_rodata_0 = .rodata:0x00000000; // type:object size:0x28 data:float lbl_303_rodata_28 = .rodata:0x00000028; // type:object size:0xCC data:float g_profile_EFFECT_GEN_TAG = .data:0x00000000; // type:object size:0x10 lbl_303_data_10 = .data:0x00000010; // type:object size:0x1C data:string -lbl_303_data_2C = .data:0x0000002C; // type:object size:0x74 +TgEffectGen__vtable = .data:0x0000002C; // type:object size:0x74 lbl_303_bss_8 = .bss:0x00000008; // type:object size:0x50 data:2byte diff --git a/config/SOUE01/rels/d_t_gate_to_groundNP/symbols.txt b/config/SOUE01/rels/d_t_gate_to_groundNP/symbols.txt index dcf4bacd..81df6ac8 100644 --- a/config/SOUE01/rels/d_t_gate_to_groundNP/symbols.txt +++ b/config/SOUE01/rels/d_t_gate_to_groundNP/symbols.txt @@ -13,4 +13,4 @@ _dtors = .dtors:0x00000000; // type:label scope:global lbl_205_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float g_profile_GATE2GND_TAG = .data:0x00000000; // type:object size:0x10 lbl_205_data_10 = .data:0x00000010; // type:object size:0xC -lbl_205_data_1C = .data:0x0000001C; // type:object size:0x74 +TgGateToGround__vtable = .data:0x0000001C; // type:object size:0x74 diff --git a/config/SOUE01/rels/d_t_gekotagNP/symbols.txt b/config/SOUE01/rels/d_t_gekotagNP/symbols.txt index 77fdf8d6..5b73298c 100644 --- a/config/SOUE01/rels/d_t_gekotagNP/symbols.txt +++ b/config/SOUE01/rels/d_t_gekotagNP/symbols.txt @@ -48,7 +48,7 @@ lbl_188_rodata_0 = .rodata:0x00000000; // type:object size:0x4 scope:local data: lbl_188_rodata_4 = .rodata:0x00000004; // type:object size:0x4 scope:local data:float lbl_188_rodata_8 = .rodata:0x00000008; // type:object size:0x8 scope:local data:double lbl_188_rodata_10 = .rodata:0x00000010; // type:object size:0x4 scope:local data:float -lbl_188_data_0 = .data:0x00000000; // type:object size:0x10 scope:local data:4byte +initialRotX = .data:0x00000000; // type:object size:0x10 scope:local data:4byte g_profile_GEKO_TAG = .data:0x00000010; // type:object size:0x10 __vt__10dTgGekoTag = .data:0x00000020; // type:object size:0x74 __vt__49sFStateMgr_c<10dTgGekoTag,20sStateMethodUsr_FI_c> = .data:0x00000098; // type:object size:0x30 diff --git a/config/SOUE01/rels/d_t_group_summonNP/symbols.txt b/config/SOUE01/rels/d_t_group_summonNP/symbols.txt index da4c9ab0..22584053 100644 --- a/config/SOUE01/rels/d_t_group_summonNP/symbols.txt +++ b/config/SOUE01/rels/d_t_group_summonNP/symbols.txt @@ -87,7 +87,7 @@ g_profile_GROUP_SUMMON = .data:0x00000000; // type:object size:0x10 data:4byte lbl_333_data_10 = .data:0x00000010; // type:object size:0x4 data:4byte lbl_333_data_14 = .data:0x00000014; // type:object size:0x10 jumptable_333_data_24 = .data:0x00000024; // type:object size:0x6C scope:local -lbl_333_data_90 = .data:0x00000090; // type:object size:0x78 +TgGroupSummon__vtable = .data:0x00000090; // type:object size:0x78 lbl_333_data_108 = .data:0x00000108; // type:object size:0x30 lbl_333_data_138 = .data:0x00000138; // type:object size:0x30 lbl_333_data_168 = .data:0x00000168; // type:object size:0x18 @@ -95,10 +95,10 @@ lbl_333_data_180 = .data:0x00000180; // type:object size:0x1E8 lbl_333_data_368 = .data:0x00000368; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_333_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_333_bss_18 = .bss:0x00000018; // type:object size:0x80 data:4byte -lbl_333_bss_98 = .bss:0x00000098; // type:object size:0x40 data:4byte -lbl_333_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_333_bss_118 = .bss:0x00000118; // type:object size:0x34 data:4byte +TgGroupSummon__STATE_WAIT = .bss:0x00000018; // type:object size:0x80 data:4byte +TgGroupSummon__STATE_SUMMONING = .bss:0x00000098; // type:object size:0x40 data:4byte +TgGroupSummon__STATE_WATCH = .bss:0x000000D8; // type:object size:0x40 data:4byte +TgGroupSummon__STATE_DEMO = .bss:0x00000118; // type:object size:0x34 data:4byte lbl_333_bss_14C = .bss:0x0000014C; // type:object size:0x4 data:4byte lbl_333_bss_150 = .bss:0x00000150; // type:object size:0x1 data:byte lbl_333_bss_154 = .bss:0x00000154; // type:object size:0x4 data:4byte diff --git a/config/SOUE01/rels/d_t_harpNP/symbols.txt b/config/SOUE01/rels/d_t_harpNP/symbols.txt index 1cf38605..640cc7ab 100644 --- a/config/SOUE01/rels/d_t_harpNP/symbols.txt +++ b/config/SOUE01/rels/d_t_harpNP/symbols.txt @@ -54,4 +54,4 @@ lbl_536_section4_118 = .data:0x00000118; // type:object size:0xC8 lbl_536_section4_1E0 = .data:0x000001E0; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_536_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_536_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +dTgHarp__ActorState__StateWait = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_t_heat_resistNP/symbols.txt b/config/SOUE01/rels/d_t_heat_resistNP/symbols.txt index 9685e5ed..1c550573 100644 --- a/config/SOUE01/rels/d_t_heat_resistNP/symbols.txt +++ b/config/SOUE01/rels/d_t_heat_resistNP/symbols.txt @@ -11,4 +11,4 @@ _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global lbl_444_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float g_profile_TAG_HEAT_RESIST = .data:0x00000000; // type:object size:0x10 -lbl_444_data_10 = .data:0x00000010; // type:object size:0x74 +TgHeatResist__vtable = .data:0x00000010; // type:object size:0x74 diff --git a/config/SOUE01/rels/d_t_kytagNP/symbols.txt b/config/SOUE01/rels/d_t_kytagNP/symbols.txt index fa86517d..ac8fe437 100644 --- a/config/SOUE01/rels/d_t_kytagNP/symbols.txt +++ b/config/SOUE01/rels/d_t_kytagNP/symbols.txt @@ -57,4 +57,4 @@ lbl_456_data_130 = .data:0x00000130; // type:object size:0xCC lbl_456_data_1FC = .data:0x000001FC; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_456_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_456_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +KytagTag__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_t_map_markNP/symbols.txt b/config/SOUE01/rels/d_t_map_markNP/symbols.txt index 77f15928..865ae0a0 100644 --- a/config/SOUE01/rels/d_t_map_markNP/symbols.txt +++ b/config/SOUE01/rels/d_t_map_markNP/symbols.txt @@ -12,4 +12,4 @@ _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global lbl_300_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float g_profile_T_MAP_MARK = .data:0x00000000; // type:object size:0x10 -lbl_300_data_10 = .data:0x00000010; // type:object size:0x74 +TgMapMark__vtable = .data:0x00000010; // type:object size:0x74 diff --git a/config/SOUE01/rels/d_t_megami_divingNP/symbols.txt b/config/SOUE01/rels/d_t_megami_divingNP/symbols.txt index 9d92b521..c36b1461 100644 --- a/config/SOUE01/rels/d_t_megami_divingNP/symbols.txt +++ b/config/SOUE01/rels/d_t_megami_divingNP/symbols.txt @@ -13,4 +13,4 @@ _dtors = .dtors:0x00000000; // type:label scope:global lbl_304_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float lbl_304_rodata_4 = .rodata:0x00000004; // type:object size:0x4 data:float g_profile_MEGAMI_DIVING_TAG = .data:0x00000000; // type:object size:0x10 -lbl_304_data_10 = .data:0x00000010; // type:object size:0x74 +TgMegamiDiving__vtable = .data:0x00000010; // type:object size:0x74 diff --git a/config/SOUE01/rels/d_t_miechanNP/symbols.txt b/config/SOUE01/rels/d_t_miechanNP/symbols.txt index 918ceea3..ab7d50dc 100644 --- a/config/SOUE01/rels/d_t_miechanNP/symbols.txt +++ b/config/SOUE01/rels/d_t_miechanNP/symbols.txt @@ -54,7 +54,7 @@ __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 sc lbl_126_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float lbl_126_rodata_4 = .rodata:0x00000004; // type:object size:0x4 data:float g_profile_TAG_MIECHAN = .data:0x00000000; // type:object size:0x1C data:4byte -lbl_126_data_1C = .data:0x0000001C; // type:object size:0x74 +TgMiechan__vtable = .data:0x0000001C; // type:object size:0x74 lbl_126_data_90 = .data:0x00000090; // type:object size:0x30 lbl_126_data_C0 = .data:0x000000C0; // type:object size:0x30 lbl_126_data_F0 = .data:0x000000F0; // type:object size:0x18 @@ -62,6 +62,6 @@ lbl_126_data_108 = .data:0x00000108; // type:object size:0x150 lbl_126_data_258 = .data:0x00000258; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_126_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_126_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_126_bss_58 = .bss:0x00000058; // type:object size:0x40 data:4byte -lbl_126_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +TgMiechan__STATE_SEARCH = .bss:0x00000018; // type:object size:0x40 data:4byte +TgMiechan__STATE_WAIT_1 = .bss:0x00000058; // type:object size:0x40 data:4byte +TgMiechan__STATE_WAIT_2 = .bss:0x00000098; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_t_musouNP/symbols.txt b/config/SOUE01/rels/d_t_musouNP/symbols.txt index 58f4196f..2c40cecc 100644 --- a/config/SOUE01/rels/d_t_musouNP/symbols.txt +++ b/config/SOUE01/rels/d_t_musouNP/symbols.txt @@ -46,7 +46,7 @@ lbl_335_rodata_4C = .rodata:0x0000004C; // type:object size:0x14 data:float lbl_335_rodata_60 = .rodata:0x00000060; // type:object size:0x1C lbl_335_rodata_7C = .rodata:0x0000007C; // type:object size:0x4 data:float g_profile_T_KUMITE = .data:0x00000000; // type:object size:0x10 -lbl_335_data_10 = .data:0x00000010; // type:object size:0x74 +TgMusou__vtable = .data:0x00000010; // type:object size:0x74 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_335_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte lbl_335_bss_18 = .bss:0x00000018; // type:object size:0x10 data:4byte diff --git a/config/SOUE01/rels/d_t_player_restartNP/symbols.txt b/config/SOUE01/rels/d_t_player_restartNP/symbols.txt index 888e1e7f..5b6aad8d 100644 --- a/config/SOUE01/rels/d_t_player_restartNP/symbols.txt +++ b/config/SOUE01/rels/d_t_player_restartNP/symbols.txt @@ -11,4 +11,4 @@ lbl_201_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float lbl_201_rodata_4 = .rodata:0x00000004; // type:object size:0x4 data:float g_profile_PL_RESTART = .data:0x00000000; // type:object size:0x10 lbl_201_data_10 = .data:0x00000010; // type:object size:0x4 data:4byte -lbl_201_data_14 = .data:0x00000014; // type:object size:0x74 +TgPlayerRestart__vtable = .data:0x00000014; // type:object size:0x74 diff --git a/config/SOUE01/rels/d_t_plightNP/symbols.txt b/config/SOUE01/rels/d_t_plightNP/symbols.txt index 0bfc57f1..48e7374a 100644 --- a/config/SOUE01/rels/d_t_plightNP/symbols.txt +++ b/config/SOUE01/rels/d_t_plightNP/symbols.txt @@ -13,4 +13,4 @@ _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global lbl_503_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float g_profile_PLIGHT_TAG = .data:0x00000000; // type:object size:0x10 -lbl_503_data_10 = .data:0x00000010; // type:object size:0x74 +TagPLight__vtable = .data:0x00000010; // type:object size:0x74 diff --git a/config/SOUE01/rels/d_t_pltchgNP/symbols.txt b/config/SOUE01/rels/d_t_pltchgNP/symbols.txt index 71d2f652..65789bc2 100644 --- a/config/SOUE01/rels/d_t_pltchgNP/symbols.txt +++ b/config/SOUE01/rels/d_t_pltchgNP/symbols.txt @@ -18,4 +18,4 @@ lbl_502_rodata_10 = .rodata:0x00000010; // type:object size:0x4 data:float lbl_502_rodata_18 = .rodata:0x00000018; // type:object size:0x8 data:double g_profile_PLTCHG_TAG = .data:0x00000000; // type:object size:0x10 lbl_502_data_10 = .data:0x00000010; // type:object size:0x4 data:4byte -lbl_502_data_14 = .data:0x00000014; // type:object size:0x74 +TagPlightChg__vtable = .data:0x00000014; // type:object size:0x74 diff --git a/config/SOUE01/rels/d_t_pumpkin_clayNP/symbols.txt b/config/SOUE01/rels/d_t_pumpkin_clayNP/symbols.txt index 70089626..819cb353 100644 --- a/config/SOUE01/rels/d_t_pumpkin_clayNP/symbols.txt +++ b/config/SOUE01/rels/d_t_pumpkin_clayNP/symbols.txt @@ -47,7 +47,7 @@ __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 sc lbl_560_rodata_0 = .rodata:0x00000000; // type:object size:0x70 data:float lbl_560_rodata_70 = .rodata:0x00000070; // type:object size:0x8 data:float g_profile_TAG_PUMPKIN_CLAY = .data:0x00000000; // type:object size:0x10 data:4byte -lbl_560_data_10 = .data:0x00000010; // type:object size:0x78 +TgPumpkinClay__vtable = .data:0x00000010; // type:object size:0x78 lbl_560_data_88 = .data:0x00000088; // type:object size:0x30 lbl_560_data_B8 = .data:0x000000B8; // type:object size:0x30 lbl_560_data_E8 = .data:0x000000E8; // type:object size:0x18 @@ -55,4 +55,4 @@ lbl_560_data_100 = .data:0x00000100; // type:object size:0xD0 lbl_560_data_1D0 = .data:0x000001D0; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_560_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_560_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +TgPumpkinClay__STATE_WAIT = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_t_reactionNP/symbols.txt b/config/SOUE01/rels/d_t_reactionNP/symbols.txt index 370e3284..9b7d2891 100644 --- a/config/SOUE01/rels/d_t_reactionNP/symbols.txt +++ b/config/SOUE01/rels/d_t_reactionNP/symbols.txt @@ -52,7 +52,7 @@ lbl_578_rodata_4 = .rodata:0x00000004; // type:object size:0x1C data:float lbl_578_rodata_20 = .rodata:0x00000020; // type:object size:0x8 data:double g_profile_TAG_REACTION = .data:0x00000000; // type:object size:0x64 data:4byte lbl_578_data_64 = .data:0x00000064; // type:object size:0x4 data:4byte -lbl_578_data_68 = .data:0x00000068; // type:object size:0x80 +TgReaction__vtable = .data:0x00000068; // type:object size:0x80 lbl_578_data_E8 = .data:0x000000E8; // type:object size:0x30 lbl_578_data_118 = .data:0x00000118; // type:object size:0x30 lbl_578_data_148 = .data:0x00000148; // type:object size:0x18 @@ -60,4 +60,4 @@ lbl_578_data_160 = .data:0x00000160; // type:object size:0x58 lbl_578_data_1B8 = .data:0x000001B8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_578_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_578_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +TgReaction__StateID_Wait = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_t_restart_time_stoneNP/symbols.txt b/config/SOUE01/rels/d_t_restart_time_stoneNP/symbols.txt index 50065c02..1114bb64 100644 --- a/config/SOUE01/rels/d_t_restart_time_stoneNP/symbols.txt +++ b/config/SOUE01/rels/d_t_restart_time_stoneNP/symbols.txt @@ -11,4 +11,4 @@ _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global lbl_617_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float g_profile_TAG_RESTART_TIME_STONE = .data:0x00000000; // type:object size:0x10 -lbl_617_data_10 = .data:0x00000010; // type:object size:0x74 +TgRestartTimeStone__vtable = .data:0x00000010; // type:object size:0x74 diff --git a/config/SOUE01/rels/d_t_ride_rock_setNP/symbols.txt b/config/SOUE01/rels/d_t_ride_rock_setNP/symbols.txt index b365438f..e7ce368f 100644 --- a/config/SOUE01/rels/d_t_ride_rock_setNP/symbols.txt +++ b/config/SOUE01/rels/d_t_ride_rock_setNP/symbols.txt @@ -20,6 +20,6 @@ _dtors = .dtors:0x00000000; // type:label scope:global lbl_209_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float g_profile_RIDE_ROCK_SET_TAG = .data:0x00000000; // type:object size:0x10 lbl_209_data_10 = .data:0x00000010; // type:object size:0x4 data:4byte -lbl_209_data_14 = .data:0x00000014; // type:object size:0x1 data:byte -lbl_209_data_18 = .data:0x00000018; // type:object size:0x74 -lbl_209_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +SOME_PNT_INDEX = .data:0x00000014; // type:object size:0x1 data:byte +TgRideRockSet__vtable = .data:0x00000018; // type:object size:0x74 +ANOTHER_PNT_IDX = .bss:0x00000008; // type:object size:0x1 data:byte diff --git a/config/SOUE01/rels/d_t_scene_changeNP/symbols.txt b/config/SOUE01/rels/d_t_scene_changeNP/symbols.txt index 96f39adb..6a67dd76 100644 --- a/config/SOUE01/rels/d_t_scene_changeNP/symbols.txt +++ b/config/SOUE01/rels/d_t_scene_changeNP/symbols.txt @@ -18,4 +18,4 @@ g_profile_SC_CHANGE_TAG = .data:0x00000018; // type:object size:0x10 lbl_204_data_28 = .data:0x00000028; // type:object size:0x4 data:4byte lbl_204_data_2C = .data:0x0000002C; // type:object size:0x4 data:4byte lbl_204_data_30 = .data:0x00000030; // type:object size:0xC data:string -lbl_204_data_3C = .data:0x0000003C; // type:object size:0x74 +TgSceneChange__vtable = .data:0x0000003C; // type:object size:0x74 diff --git a/config/SOUE01/rels/d_t_ship_floodNP/symbols.txt b/config/SOUE01/rels/d_t_ship_floodNP/symbols.txt index c91d0c06..5fcae53f 100644 --- a/config/SOUE01/rels/d_t_ship_floodNP/symbols.txt +++ b/config/SOUE01/rels/d_t_ship_floodNP/symbols.txt @@ -62,5 +62,5 @@ lbl_441_data_108 = .data:0x00000108; // type:object size:0x114 lbl_441_data_21C = .data:0x0000021C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_441_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_441_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_441_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +TgShipFlood__StateID_Wait = .bss:0x00000018; // type:object size:0x40 data:4byte +TgShipFlood__StateID_Stop = .bss:0x00000058; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_t_shutter_fence_forbiddanceNP/symbols.txt b/config/SOUE01/rels/d_t_shutter_fence_forbiddanceNP/symbols.txt index 30b26d2c..77e4f804 100644 --- a/config/SOUE01/rels/d_t_shutter_fence_forbiddanceNP/symbols.txt +++ b/config/SOUE01/rels/d_t_shutter_fence_forbiddanceNP/symbols.txt @@ -10,4 +10,4 @@ _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global g_profile_TAG_SHUTTER_FENCE_FORBIDDANCE = .data:0x00000000; // type:object size:0x10 lbl_631_section4_10 = .data:0x00000010; // type:object size:0x74 -lbl_631_bss_8 = .bss:0x00000008; // type:object size:0x4 data:4byte +TgShutterFenceForbiddance__FIRST_PTR = .bss:0x00000008; // type:object size:0x4 data:4byte diff --git a/config/SOUE01/rels/d_t_siren_time_attackNP/symbols.txt b/config/SOUE01/rels/d_t_siren_time_attackNP/symbols.txt index 07adaec3..884bf2c3 100644 --- a/config/SOUE01/rels/d_t_siren_time_attackNP/symbols.txt +++ b/config/SOUE01/rels/d_t_siren_time_attackNP/symbols.txt @@ -75,5 +75,5 @@ lbl_73_section4_160 = .data:0x00000160; // type:object size:0x120 lbl_73_section4_280 = .data:0x00000280; // type:object size:0x68 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_73_bss_8 = .bss:0x00000008; // type:object size:0xC data:4byte -lbl_73_bss_14 = .bss:0x00000014; // type:object size:0x40 data:4byte -lbl_73_bss_54 = .bss:0x00000054; // type:object size:0x34 data:4byte +TgSirenTimeAttack__STATE_WAIT = .bss:0x00000014; // type:object size:0x40 data:4byte +TgSirenTimeAttack__STATE_MANAGE = .bss:0x00000054; // type:object size:0x34 data:4byte diff --git a/config/SOUE01/rels/d_t_skyEnemyNP/symbols.txt b/config/SOUE01/rels/d_t_skyEnemyNP/symbols.txt index 3dd28deb..9009a30b 100644 --- a/config/SOUE01/rels/d_t_skyEnemyNP/symbols.txt +++ b/config/SOUE01/rels/d_t_skyEnemyNP/symbols.txt @@ -73,7 +73,7 @@ lbl_564_rodata_78 = .rodata:0x00000078; // type:object size:0x4 data:float lbl_564_data_0 = .data:0x00000000; // type:object size:0x10 data:4byte g_profile_SKYENEMY_T = .data:0x00000010; // type:object size:0x10 lbl_564_data_20 = .data:0x00000020; // type:object size:0x1C data:4byte -lbl_564_data_3C = .data:0x0000003C; // type:object size:0x74 +TgSkyEnemy__vtable = .data:0x0000003C; // type:object size:0x74 lbl_564_data_B0 = .data:0x000000B0; // type:object size:0x30 lbl_564_data_E0 = .data:0x000000E0; // type:object size:0x30 lbl_564_data_110 = .data:0x00000110; // type:object size:0x18 @@ -81,4 +81,4 @@ lbl_564_data_128 = .data:0x00000128; // type:object size:0x2E8 lbl_564_data_410 = .data:0x00000410; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_564_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_564_bss_18 = .bss:0x00000018; // type:object size:0x1F0 data:4byte +TgSkyEnemy__STATE_WAIT = .bss:0x00000018; // type:object size:0x1F0 data:4byte diff --git a/config/SOUE01/rels/d_t_sporeNP/symbols.txt b/config/SOUE01/rels/d_t_sporeNP/symbols.txt index 211f675f..bc19fd25 100644 --- a/config/SOUE01/rels/d_t_sporeNP/symbols.txt +++ b/config/SOUE01/rels/d_t_sporeNP/symbols.txt @@ -52,7 +52,7 @@ g_profile_SPORE_TAG = .data:0x00000000; // type:object size:0x10 data:4byte lbl_454_data_10 = .data:0x00000010; // type:object size:0x8 lbl_454_data_18 = .data:0x00000018; // type:object size:0x14 lbl_454_data_2C = .data:0x0000002C; // type:object size:0x1C -lbl_454_data_48 = .data:0x00000048; // type:object size:0x78 +SporeTag__vtable = .data:0x00000048; // type:object size:0x78 lbl_454_data_C0 = .data:0x000000C0; // type:object size:0x30 lbl_454_data_F0 = .data:0x000000F0; // type:object size:0x30 lbl_454_data_120 = .data:0x00000120; // type:object size:0x18 @@ -61,4 +61,4 @@ lbl_454_data_150 = .data:0x00000150; // type:object size:0xE0 lbl_454_data_230 = .data:0x00000230; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_454_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_454_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +SporeTag__StateID_Wait = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_t_streamNP/symbols.txt b/config/SOUE01/rels/d_t_streamNP/symbols.txt index dfd41d59..70b4b2ce 100644 --- a/config/SOUE01/rels/d_t_streamNP/symbols.txt +++ b/config/SOUE01/rels/d_t_streamNP/symbols.txt @@ -12,4 +12,4 @@ _dtors = .dtors:0x00000000; // type:label scope:global lbl_203_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float g_profile_TAG_STREAM = .data:0x00000000; // type:object size:0x10 lbl_203_data_10 = .data:0x00000010; // type:object size:0x4 data:4byte -lbl_203_data_14 = .data:0x00000014; // type:object size:0x74 +TgStream__vtable = .data:0x00000014; // type:object size:0x74 diff --git a/config/SOUE01/rels/d_t_sword_battle_gameNP/symbols.txt b/config/SOUE01/rels/d_t_sword_battle_gameNP/symbols.txt index 33582211..d8355590 100644 --- a/config/SOUE01/rels/d_t_sword_battle_gameNP/symbols.txt +++ b/config/SOUE01/rels/d_t_sword_battle_gameNP/symbols.txt @@ -103,7 +103,7 @@ lbl_72_section4_220 = .data:0x00000220; // type:object size:0x120 lbl_72_section4_340 = .data:0x00000340; // type:object size:0x68 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_72_bss_8 = .bss:0x00000008; // type:object size:0xC data:4byte -lbl_72_bss_14 = .bss:0x00000014; // type:object size:0x40 data:4byte -lbl_72_bss_54 = .bss:0x00000054; // type:object size:0x34 data:4byte +TgSwordBattleGame__STATE_WAIT = .bss:0x00000014; // type:object size:0x40 data:4byte +TgSwordBattleGame__STATE_MANAGE = .bss:0x00000054; // type:object size:0x34 data:4byte lbl_72_bss_88 = .bss:0x00000088; // type:object size:0x4 data:4byte lbl_72_bss_8C = .bss:0x0000008C; // type:object size:0x1 data:byte diff --git a/config/SOUE01/rels/d_t_touchNP/symbols.txt b/config/SOUE01/rels/d_t_touchNP/symbols.txt index 213edde5..585a89b0 100644 --- a/config/SOUE01/rels/d_t_touchNP/symbols.txt +++ b/config/SOUE01/rels/d_t_touchNP/symbols.txt @@ -49,7 +49,7 @@ __vt__50sFStateMgr_c<11dTgTouchTag,20sStateMethodUsr_FI_c> = .data:0x00000088; / __vt__80sStateMgr_c<11dTgTouchTag,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x000000B8; // type:object size:0x30 __vt__27sFStateFct_c<11dTgTouchTag> = .data:0x000000E8; // type:object size:0x14 __vt__24sFState_c<11dTgTouchTag> = .data:0x00000100; // type:object size:0x18 -lbl_565_data_1CC = .data:0x000001CC; // type:object size:0x34 scope:local +sFStateID_c____vtable = .data:0x000001CC; // type:object size:0x34 scope:local __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_565_bss_8 = .bss:0x00000008; // type:object size:0x10 scope:local StateID_Wait__11dTgTouchTag = .bss:0x00000018; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_t_tumble_weedNP/symbols.txt b/config/SOUE01/rels/d_t_tumble_weedNP/symbols.txt index eed1849c..de219c32 100644 --- a/config/SOUE01/rels/d_t_tumble_weedNP/symbols.txt +++ b/config/SOUE01/rels/d_t_tumble_weedNP/symbols.txt @@ -64,5 +64,5 @@ __vt__30sFStateID_c<15dTgTumbleWeed_c> = .data:0x00000260; // type:object size:0 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_476_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte StateID_AreaOut__15dTgTumbleWeed_c = .bss:0x00000018; // type:object size:0x30 data:4byte -lbl_476_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte -lbl_476_bss_98 = .bss:0x00000098; // type:object size:0x30 data:4byte +TgTumbleWeed__StateID_AreaIn = .bss:0x00000058; // type:object size:0x30 data:4byte +TgTumbleWeed__StateID_Wind = .bss:0x00000098; // type:object size:0x30 data:4byte diff --git a/config/SOUE01/rels/d_title_managerNP/symbols.txt b/config/SOUE01/rels/d_title_managerNP/symbols.txt index 649fd223..d5698ce3 100644 --- a/config/SOUE01/rels/d_title_managerNP/symbols.txt +++ b/config/SOUE01/rels/d_title_managerNP/symbols.txt @@ -73,7 +73,7 @@ lbl_559_section4_108 = .data:0x00000108; // type:object size:0x1AC lbl_559_section4_2B4 = .data:0x000002B4; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_559_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_559_bss_18 = .bss:0x00000018; // type:object size:0xC0 data:4byte -lbl_559_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_559_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_559_bss_158 = .bss:0x00000158; // type:object size:0x30 data:4byte +TitleMgr__STATE_INIT = .bss:0x00000018; // type:object size:0xC0 data:4byte +TitleMgr__STATE_TITLE = .bss:0x000000D8; // type:object size:0x40 data:4byte +TitleMgr__STATE_FILE_SELECT = .bss:0x00000118; // type:object size:0x40 data:4byte +TitleMgr__STATE_INPUT = .bss:0x00000158; // type:object size:0x30 data:4byte diff --git a/tools/ghidra_scripts/GhidraToDtkSymbols.py b/tools/ghidra_scripts/GhidraToDtkSymbols.py index 23301f9c..d545d7d9 100644 --- a/tools/ghidra_scripts/GhidraToDtkSymbols.py +++ b/tools/ghidra_scripts/GhidraToDtkSymbols.py @@ -8,57 +8,82 @@ import os import re +from ghidra.program.model.symbol.SourceType import * +from ghidra.program.model.symbol.Namespace import * +from ghidra.program.model.listing.CodeUnit import * + AF = currentProgram.getAddressFactory() mem = currentProgram.getMemory() listing = currentProgram.getListing() -sym_re = re.compile("(?:lbl|fn|FUN|DAT)_[0-9A-Fa-f_]+ = \\.([a-z0-9]+):0x([0-9A-Fa-f]{8})(.*)\n") -default_sym_re = re.compile(".*_[0-9A-Za-z]+$") +sym_re = re.compile("(?:lbl|fn|FUN|DAT)(?:_[0-9]+_[a-z]+)_[0-9A-Fa-f_]+ = \\.([a-z0-9]+):0x([0-9A-Fa-f]{8})(.*)\n") +default_sym_re = re.compile("^(lbl|fn|FUN|DAT)_[0-9A-Za-z]+$") +rel_default_sym_re = re.compile("lbl_[0-9]+_[a-z]+_[0-9A-Za-z]+$") used_symbols = set() -def transformer_for_file(file_name): +def get_section_names(file_name, config_dir): + splits_path = os.path.join(config_dir, "rels", file_name, "splits.txt") + section_names = [] + with open(splits_path, "rt") as file: + for line in file: + line = line.strip() + if line == "": + break + elif line == "Sections:": + continue + else: + section_names.append(line.split()[0]) + return section_names + +def transformer_for_file(file_name, config_dir, fix_mistakes_mode): + if file_name != "MAIN": + section_names = get_section_names(file_name, config_dir) + blocks = mem.getBlocks() + blocks = [b for b in blocks if b.getName().startswith(file_name)] + def transformer(section, address): if file_name == "MAIN": # in the main dol, each symbol is loaded at a fixed address addr_obj = AF.getAddress("0x%08X" % address) else: - # REL sections can't be reliably identified - if section != "text": - return None - # in rels, every section is relocated indivdually, so treat - # this as an offset - block_name = file_name + "_." + section + "0" - print(block_name) - block = mem.getBlock(block_name) + index = section_names.index("." + section) + block = blocks[index] addr_obj = block.getStart().add(address) symbol = getSymbolAt(addr_obj) if symbol: #and symbol.getAddress().equals(addr_obj): name = symbol.getName(True) - if default_sym_re.match(name): + if fix_mistakes_mode and rel_default_sym_re.match(name): + unit = listing.getCodeUnitAt(addr_obj) + if unit: + comment_str = unit.getComment(PLATE_COMMENT) + if comment_str and comment_str.startswith("original-name"): + name = comment_str.split('\n')[0][len("original-name "):] + + if default_sym_re.match(name) or name.startswith("@"): return None # in our Ghidra the RVL symbols are helpfully namespaced... bad_prefixes = [ - "ai::", - "arc::", - "axfx::", - "dvd::", - "exi::", - "gx::", - "kpad::", - "mem::", - "mtx::", - "nand::", - "os::", - "sc::", - "si::", - "tpl::", - "vi::", - "wenc::", - "wpad::", - "wud::", + "ai::", + "arc::", + "axfx::" + "dvd::", + "exi::", + "gx::", + "kpad::", + "mem::", + "mtx::", + "nand::", + "os::", + "sc::", + "si::", + "tpl::", + "vi::", + "wenc::", + "wpad::", + "wud::", ] lowercase_name = name.lower() for prefix in bad_prefixes: @@ -99,17 +124,24 @@ def transform_symbols_file(file, transformer): continue used_symbols.add(line.split("=")[0][:-1]) - + new_file += line return new_file path = str(askDirectory("Program config directory (e.g. config/SOUE01)", "Export")) +# we accidentally "lost" some symbols during our symbols migration +fix_mistakes_mode = askChoice( + "Fix accidental symbol loss mistake", + "Select no if you don't know what this is", + ["Yes", "No"], + "No" +) == "Yes" new_contents = None main_symbols = os.path.join(path, "symbols.txt") with open(main_symbols, "rt") as file: - new_contents = transform_symbols_file(file, transformer_for_file("MAIN")) + new_contents = transform_symbols_file(file, transformer_for_file("MAIN", path, fix_mistakes_mode)) with open(main_symbols, 'w') as f: f.write(new_contents) @@ -120,7 +152,7 @@ for rel_name in os.listdir(rels_dir): if rel_name.endswith("NP"): rel_symbols = os.path.join(rels_dir, rel_name, "symbols.txt") with open(rel_symbols, "rt") as file: - new_contents = transform_symbols_file(file, transformer_for_file(rel_name)) + new_contents = transform_symbols_file(file, transformer_for_file(rel_name, path, fix_mistakes_mode)) with open(rel_symbols, 'w') as f: f.write(new_contents)