mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
Introduce object_table.h (#1136)
* object_table * segmentsymbols * format * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * bss * add more descriptions to the object_table * DEFINE_OBJECT_SIZE_ZERO * Update include/tables/object_table.h Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Rename `z_scene_dlftbls.c` to `object_table.c` * bss * bss * bss * bss --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
This commit is contained in:
Anghelo Carvajal
co-authored by
Derek Hensley
EllipticEllipsis
Derek Hensley
EllipticEllipsis
parent
5941e09b22
commit
5bc388b9a9
+10
-464
@@ -126,470 +126,15 @@ DECLARE_OVERLAY_SEGMENT(fbdemo_wipe4)
|
||||
DECLARE_OVERLAY_SEGMENT(fbdemo_wipe5)
|
||||
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Sbn)
|
||||
|
||||
DECLARE_ROM_SEGMENT(gameplay_keep)
|
||||
DECLARE_ROM_SEGMENT(gameplay_field_keep)
|
||||
DECLARE_ROM_SEGMENT(gameplay_dangeon_keep)
|
||||
DECLARE_ROM_SEGMENT(object_link_boy)
|
||||
DECLARE_ROM_SEGMENT(object_link_child)
|
||||
DECLARE_ROM_SEGMENT(object_link_goron)
|
||||
DECLARE_ROM_SEGMENT(object_link_zora)
|
||||
DECLARE_ROM_SEGMENT(object_link_nuts)
|
||||
DECLARE_ROM_SEGMENT(object_mask_ki_tan)
|
||||
DECLARE_ROM_SEGMENT(object_mask_rabit)
|
||||
DECLARE_ROM_SEGMENT(object_mask_skj)
|
||||
DECLARE_ROM_SEGMENT(object_mask_truth)
|
||||
DECLARE_ROM_SEGMENT(object_mask_gibudo)
|
||||
DECLARE_ROM_SEGMENT(object_mask_json)
|
||||
DECLARE_ROM_SEGMENT(object_mask_kerfay)
|
||||
DECLARE_ROM_SEGMENT(object_mask_bigelf)
|
||||
DECLARE_ROM_SEGMENT(object_mask_kyojin)
|
||||
DECLARE_ROM_SEGMENT(object_mask_romerny)
|
||||
DECLARE_ROM_SEGMENT(object_mask_posthat)
|
||||
DECLARE_ROM_SEGMENT(object_mask_zacho)
|
||||
DECLARE_ROM_SEGMENT(object_mask_stone)
|
||||
DECLARE_ROM_SEGMENT(object_mask_bree)
|
||||
DECLARE_ROM_SEGMENT(object_mask_gero)
|
||||
DECLARE_ROM_SEGMENT(object_mask_yofukasi)
|
||||
DECLARE_ROM_SEGMENT(object_mask_meoto)
|
||||
DECLARE_ROM_SEGMENT(object_mask_dancer)
|
||||
DECLARE_ROM_SEGMENT(object_mask_bakuretu)
|
||||
DECLARE_ROM_SEGMENT(object_mask_bu_san)
|
||||
DECLARE_ROM_SEGMENT(object_mask_goron)
|
||||
DECLARE_ROM_SEGMENT(object_mask_zora)
|
||||
DECLARE_ROM_SEGMENT(object_mask_nuts)
|
||||
DECLARE_ROM_SEGMENT(object_mask_boy)
|
||||
DECLARE_ROM_SEGMENT(object_box)
|
||||
DECLARE_ROM_SEGMENT(object_okuta)
|
||||
DECLARE_ROM_SEGMENT(object_wallmaster)
|
||||
DECLARE_ROM_SEGMENT(object_dy_obj)
|
||||
DECLARE_ROM_SEGMENT(object_firefly)
|
||||
DECLARE_ROM_SEGMENT(object_dodongo)
|
||||
DECLARE_ROM_SEGMENT(object_niw)
|
||||
DECLARE_ROM_SEGMENT(object_tite)
|
||||
DECLARE_ROM_SEGMENT(object_ph)
|
||||
DECLARE_ROM_SEGMENT(object_dinofos)
|
||||
DECLARE_ROM_SEGMENT(object_zl1)
|
||||
DECLARE_ROM_SEGMENT(object_bubble)
|
||||
DECLARE_ROM_SEGMENT(object_test3)
|
||||
DECLARE_ROM_SEGMENT(object_famos)
|
||||
DECLARE_ROM_SEGMENT(object_st)
|
||||
DECLARE_ROM_SEGMENT(object_thiefbird)
|
||||
DECLARE_ROM_SEGMENT(object_bombf)
|
||||
DECLARE_ROM_SEGMENT(object_am)
|
||||
DECLARE_ROM_SEGMENT(object_dekubaba)
|
||||
DECLARE_ROM_SEGMENT(object_warp1)
|
||||
DECLARE_ROM_SEGMENT(object_b_heart)
|
||||
DECLARE_ROM_SEGMENT(object_dekunuts)
|
||||
DECLARE_ROM_SEGMENT(object_bb)
|
||||
DECLARE_ROM_SEGMENT(object_death)
|
||||
DECLARE_ROM_SEGMENT(object_hata)
|
||||
DECLARE_ROM_SEGMENT(object_wood02)
|
||||
DECLARE_ROM_SEGMENT(object_trap)
|
||||
DECLARE_ROM_SEGMENT(object_vm)
|
||||
DECLARE_ROM_SEGMENT(object_efc_star_field)
|
||||
DECLARE_ROM_SEGMENT(object_rd)
|
||||
DECLARE_ROM_SEGMENT(object_yukimura_obj)
|
||||
DECLARE_ROM_SEGMENT(object_horse_link_child)
|
||||
DECLARE_ROM_SEGMENT(object_syokudai)
|
||||
DECLARE_ROM_SEGMENT(object_efc_tw)
|
||||
DECLARE_ROM_SEGMENT(object_gi_key)
|
||||
DECLARE_ROM_SEGMENT(object_mir_ray)
|
||||
DECLARE_ROM_SEGMENT(object_ctower_rot)
|
||||
DECLARE_ROM_SEGMENT(object_bdoor)
|
||||
DECLARE_ROM_SEGMENT(object_sb)
|
||||
DECLARE_ROM_SEGMENT(object_gi_melody)
|
||||
DECLARE_ROM_SEGMENT(object_gi_heart)
|
||||
DECLARE_ROM_SEGMENT(object_gi_compass)
|
||||
DECLARE_ROM_SEGMENT(object_gi_bosskey)
|
||||
DECLARE_ROM_SEGMENT(object_gi_nuts)
|
||||
DECLARE_ROM_SEGMENT(object_gi_hearts)
|
||||
DECLARE_ROM_SEGMENT(object_gi_arrowcase)
|
||||
DECLARE_ROM_SEGMENT(object_gi_bombpouch)
|
||||
DECLARE_ROM_SEGMENT(object_in)
|
||||
DECLARE_ROM_SEGMENT(object_os_anime)
|
||||
DECLARE_ROM_SEGMENT(object_gi_bottle)
|
||||
DECLARE_ROM_SEGMENT(object_gi_stick)
|
||||
DECLARE_ROM_SEGMENT(object_gi_map)
|
||||
DECLARE_ROM_SEGMENT(object_oF1d_map)
|
||||
DECLARE_ROM_SEGMENT(object_ru2)
|
||||
DECLARE_ROM_SEGMENT(object_gi_magicpot)
|
||||
DECLARE_ROM_SEGMENT(object_gi_bomb_1)
|
||||
DECLARE_ROM_SEGMENT(object_ma2)
|
||||
DECLARE_ROM_SEGMENT(object_gi_purse)
|
||||
DECLARE_ROM_SEGMENT(object_rr)
|
||||
DECLARE_ROM_SEGMENT(object_gi_arrow)
|
||||
DECLARE_ROM_SEGMENT(object_gi_bomb_2)
|
||||
DECLARE_ROM_SEGMENT(object_gi_shield_2)
|
||||
DECLARE_ROM_SEGMENT(object_gi_hookshot)
|
||||
DECLARE_ROM_SEGMENT(object_gi_ocarina)
|
||||
DECLARE_ROM_SEGMENT(object_gi_milk)
|
||||
DECLARE_ROM_SEGMENT(object_ma1)
|
||||
DECLARE_ROM_SEGMENT(object_ny)
|
||||
DECLARE_ROM_SEGMENT(object_fr)
|
||||
DECLARE_ROM_SEGMENT(object_gi_bow)
|
||||
DECLARE_ROM_SEGMENT(object_gi_glasses)
|
||||
DECLARE_ROM_SEGMENT(object_gi_liquid)
|
||||
DECLARE_ROM_SEGMENT(object_ani)
|
||||
DECLARE_ROM_SEGMENT(object_gi_shield_3)
|
||||
DECLARE_ROM_SEGMENT(object_gi_bean)
|
||||
DECLARE_ROM_SEGMENT(object_gi_fish)
|
||||
DECLARE_ROM_SEGMENT(object_gi_longsword)
|
||||
DECLARE_ROM_SEGMENT(object_zo)
|
||||
DECLARE_ROM_SEGMENT(object_umajump)
|
||||
DECLARE_ROM_SEGMENT(object_mastergolon)
|
||||
DECLARE_ROM_SEGMENT(object_masterzoora)
|
||||
DECLARE_ROM_SEGMENT(object_aob)
|
||||
DECLARE_ROM_SEGMENT(object_ik)
|
||||
DECLARE_ROM_SEGMENT(object_ahg)
|
||||
DECLARE_ROM_SEGMENT(object_cne)
|
||||
DECLARE_ROM_SEGMENT(object_bji)
|
||||
DECLARE_ROM_SEGMENT(object_bba)
|
||||
DECLARE_ROM_SEGMENT(object_an1)
|
||||
DECLARE_ROM_SEGMENT(object_boj)
|
||||
DECLARE_ROM_SEGMENT(object_fz)
|
||||
DECLARE_ROM_SEGMENT(object_bob)
|
||||
DECLARE_ROM_SEGMENT(object_ge1)
|
||||
DECLARE_ROM_SEGMENT(object_yabusame_point)
|
||||
DECLARE_ROM_SEGMENT(object_d_hsblock)
|
||||
DECLARE_ROM_SEGMENT(object_d_lift)
|
||||
DECLARE_ROM_SEGMENT(object_mamenoki)
|
||||
DECLARE_ROM_SEGMENT(object_goroiwa)
|
||||
DECLARE_ROM_SEGMENT(object_toryo)
|
||||
DECLARE_ROM_SEGMENT(object_daiku)
|
||||
DECLARE_ROM_SEGMENT(object_nwc)
|
||||
DECLARE_ROM_SEGMENT(object_gm)
|
||||
DECLARE_ROM_SEGMENT(object_ms)
|
||||
DECLARE_ROM_SEGMENT(object_hs)
|
||||
DECLARE_ROM_SEGMENT(object_lightswitch)
|
||||
DECLARE_ROM_SEGMENT(object_kusa)
|
||||
DECLARE_ROM_SEGMENT(object_tsubo)
|
||||
DECLARE_ROM_SEGMENT(object_kanban)
|
||||
DECLARE_ROM_SEGMENT(object_owl)
|
||||
DECLARE_ROM_SEGMENT(object_mk)
|
||||
DECLARE_ROM_SEGMENT(object_fu)
|
||||
DECLARE_ROM_SEGMENT(object_gi_ki_tan_mask)
|
||||
DECLARE_ROM_SEGMENT(object_gi_mask18)
|
||||
DECLARE_ROM_SEGMENT(object_gi_rabit_mask)
|
||||
DECLARE_ROM_SEGMENT(object_gi_truth_mask)
|
||||
DECLARE_ROM_SEGMENT(object_stream)
|
||||
DECLARE_ROM_SEGMENT(object_mm)
|
||||
DECLARE_ROM_SEGMENT(object_js)
|
||||
DECLARE_ROM_SEGMENT(object_cs)
|
||||
DECLARE_ROM_SEGMENT(object_gi_soldout)
|
||||
DECLARE_ROM_SEGMENT(object_mag)
|
||||
DECLARE_ROM_SEGMENT(object_gi_golonmask)
|
||||
DECLARE_ROM_SEGMENT(object_gi_zoramask)
|
||||
DECLARE_ROM_SEGMENT(object_ka)
|
||||
DECLARE_ROM_SEGMENT(object_zg)
|
||||
DECLARE_ROM_SEGMENT(object_gi_m_arrow)
|
||||
DECLARE_ROM_SEGMENT(object_ds2)
|
||||
DECLARE_ROM_SEGMENT(object_fish)
|
||||
DECLARE_ROM_SEGMENT(object_gi_sutaru)
|
||||
DECLARE_ROM_SEGMENT(object_ssh)
|
||||
DECLARE_ROM_SEGMENT(object_bigslime)
|
||||
DECLARE_ROM_SEGMENT(object_bg)
|
||||
DECLARE_ROM_SEGMENT(object_bombiwa)
|
||||
DECLARE_ROM_SEGMENT(object_hintnuts)
|
||||
DECLARE_ROM_SEGMENT(object_rs)
|
||||
DECLARE_ROM_SEGMENT(object_gla)
|
||||
DECLARE_ROM_SEGMENT(object_geldb)
|
||||
DECLARE_ROM_SEGMENT(object_dog)
|
||||
DECLARE_ROM_SEGMENT(object_kibako2)
|
||||
DECLARE_ROM_SEGMENT(object_dns)
|
||||
DECLARE_ROM_SEGMENT(object_dnk)
|
||||
DECLARE_ROM_SEGMENT(object_gi_insect)
|
||||
DECLARE_ROM_SEGMENT(object_gi_ghost)
|
||||
DECLARE_ROM_SEGMENT(object_gi_soul)
|
||||
DECLARE_ROM_SEGMENT(object_f40_obj)
|
||||
DECLARE_ROM_SEGMENT(object_gi_rupy)
|
||||
DECLARE_ROM_SEGMENT(object_po_composer)
|
||||
DECLARE_ROM_SEGMENT(object_mu)
|
||||
DECLARE_ROM_SEGMENT(object_wf)
|
||||
DECLARE_ROM_SEGMENT(object_skb)
|
||||
DECLARE_ROM_SEGMENT(object_gs)
|
||||
DECLARE_ROM_SEGMENT(object_ps)
|
||||
DECLARE_ROM_SEGMENT(object_omoya_obj)
|
||||
DECLARE_ROM_SEGMENT(object_crow)
|
||||
DECLARE_ROM_SEGMENT(object_cow)
|
||||
DECLARE_ROM_SEGMENT(object_gi_sword_1)
|
||||
DECLARE_ROM_SEGMENT(object_zl4)
|
||||
DECLARE_ROM_SEGMENT(object_grasshopper)
|
||||
DECLARE_ROM_SEGMENT(object_boyo)
|
||||
DECLARE_ROM_SEGMENT(object_fwall)
|
||||
DECLARE_ROM_SEGMENT(object_jso)
|
||||
DECLARE_ROM_SEGMENT(object_knight)
|
||||
DECLARE_ROM_SEGMENT(object_icicle)
|
||||
DECLARE_ROM_SEGMENT(object_spdweb)
|
||||
DECLARE_ROM_SEGMENT(object_boss01)
|
||||
DECLARE_ROM_SEGMENT(object_boss02)
|
||||
DECLARE_ROM_SEGMENT(object_boss03)
|
||||
DECLARE_ROM_SEGMENT(object_boss04)
|
||||
DECLARE_ROM_SEGMENT(object_boss05)
|
||||
DECLARE_ROM_SEGMENT(object_boss07)
|
||||
DECLARE_ROM_SEGMENT(object_raf)
|
||||
DECLARE_ROM_SEGMENT(object_funen)
|
||||
DECLARE_ROM_SEGMENT(object_raillift)
|
||||
DECLARE_ROM_SEGMENT(object_numa_obj)
|
||||
DECLARE_ROM_SEGMENT(object_flowerpot)
|
||||
DECLARE_ROM_SEGMENT(object_spinyroll)
|
||||
DECLARE_ROM_SEGMENT(object_ice_block)
|
||||
DECLARE_ROM_SEGMENT(object_keikoku_demo)
|
||||
DECLARE_ROM_SEGMENT(object_slime)
|
||||
DECLARE_ROM_SEGMENT(object_pr)
|
||||
DECLARE_ROM_SEGMENT(object_f52_obj)
|
||||
DECLARE_ROM_SEGMENT(object_f53_obj)
|
||||
DECLARE_ROM_SEGMENT(object_kibako)
|
||||
DECLARE_ROM_SEGMENT(object_sek)
|
||||
DECLARE_ROM_SEGMENT(object_gmo)
|
||||
DECLARE_ROM_SEGMENT(object_bat)
|
||||
DECLARE_ROM_SEGMENT(object_sekihil)
|
||||
DECLARE_ROM_SEGMENT(object_sekihig)
|
||||
DECLARE_ROM_SEGMENT(object_sekihin)
|
||||
DECLARE_ROM_SEGMENT(object_sekihiz)
|
||||
DECLARE_ROM_SEGMENT(object_wiz)
|
||||
DECLARE_ROM_SEGMENT(object_ladder)
|
||||
DECLARE_ROM_SEGMENT(object_mkk)
|
||||
DECLARE_ROM_SEGMENT(object_keikoku_obj)
|
||||
DECLARE_ROM_SEGMENT(object_sichitai_obj)
|
||||
DECLARE_ROM_SEGMENT(object_dekucity_ana_obj)
|
||||
DECLARE_ROM_SEGMENT(object_rat)
|
||||
DECLARE_ROM_SEGMENT(object_water_effect)
|
||||
DECLARE_ROM_SEGMENT(object_dblue_object)
|
||||
DECLARE_ROM_SEGMENT(object_bal)
|
||||
DECLARE_ROM_SEGMENT(object_warp_uzu)
|
||||
DECLARE_ROM_SEGMENT(object_driftice)
|
||||
DECLARE_ROM_SEGMENT(object_fall)
|
||||
DECLARE_ROM_SEGMENT(object_hanareyama_obj)
|
||||
DECLARE_ROM_SEGMENT(object_crace_object)
|
||||
DECLARE_ROM_SEGMENT(object_dno)
|
||||
DECLARE_ROM_SEGMENT(object_obj_tokeidai)
|
||||
DECLARE_ROM_SEGMENT(object_eg)
|
||||
DECLARE_ROM_SEGMENT(object_tru)
|
||||
DECLARE_ROM_SEGMENT(object_trt)
|
||||
DECLARE_ROM_SEGMENT(object_hakugin_obj)
|
||||
DECLARE_ROM_SEGMENT(object_horse_game_check)
|
||||
DECLARE_ROM_SEGMENT(object_stk)
|
||||
DECLARE_ROM_SEGMENT(object_mnk)
|
||||
DECLARE_ROM_SEGMENT(object_gi_bottle_red)
|
||||
DECLARE_ROM_SEGMENT(object_tokei_tobira)
|
||||
DECLARE_ROM_SEGMENT(object_az)
|
||||
DECLARE_ROM_SEGMENT(object_twig)
|
||||
DECLARE_ROM_SEGMENT(object_dekucity_obj)
|
||||
DECLARE_ROM_SEGMENT(object_po_fusen)
|
||||
DECLARE_ROM_SEGMENT(object_racetsubo)
|
||||
DECLARE_ROM_SEGMENT(object_ha)
|
||||
DECLARE_ROM_SEGMENT(object_bigokuta)
|
||||
DECLARE_ROM_SEGMENT(object_open_obj)
|
||||
DECLARE_ROM_SEGMENT(object_fu_kaiten)
|
||||
DECLARE_ROM_SEGMENT(object_fu_mato)
|
||||
DECLARE_ROM_SEGMENT(object_mtoride)
|
||||
DECLARE_ROM_SEGMENT(object_osn)
|
||||
DECLARE_ROM_SEGMENT(object_tokei_step)
|
||||
DECLARE_ROM_SEGMENT(object_lotus)
|
||||
DECLARE_ROM_SEGMENT(object_tl)
|
||||
DECLARE_ROM_SEGMENT(object_dkjail_obj)
|
||||
DECLARE_ROM_SEGMENT(object_visiblock)
|
||||
DECLARE_ROM_SEGMENT(object_tsn)
|
||||
DECLARE_ROM_SEGMENT(object_ds2n)
|
||||
DECLARE_ROM_SEGMENT(object_fsn)
|
||||
DECLARE_ROM_SEGMENT(object_shn)
|
||||
DECLARE_ROM_SEGMENT(object_bigicicle)
|
||||
DECLARE_ROM_SEGMENT(object_gi_bottle_15)
|
||||
DECLARE_ROM_SEGMENT(object_tk)
|
||||
DECLARE_ROM_SEGMENT(object_market_obj)
|
||||
DECLARE_ROM_SEGMENT(object_gi_reserve00)
|
||||
DECLARE_ROM_SEGMENT(object_gi_reserve01)
|
||||
DECLARE_ROM_SEGMENT(object_lightblock)
|
||||
DECLARE_ROM_SEGMENT(object_takaraya_objects)
|
||||
DECLARE_ROM_SEGMENT(object_wdhand)
|
||||
DECLARE_ROM_SEGMENT(object_sdn)
|
||||
DECLARE_ROM_SEGMENT(object_snowwd)
|
||||
DECLARE_ROM_SEGMENT(object_giant)
|
||||
DECLARE_ROM_SEGMENT(object_comb)
|
||||
DECLARE_ROM_SEGMENT(object_hana)
|
||||
DECLARE_ROM_SEGMENT(object_boss_hakugin)
|
||||
DECLARE_ROM_SEGMENT(object_meganeana_obj)
|
||||
DECLARE_ROM_SEGMENT(object_gi_nutsmask)
|
||||
DECLARE_ROM_SEGMENT(object_stk2)
|
||||
DECLARE_ROM_SEGMENT(object_spot11_obj)
|
||||
DECLARE_ROM_SEGMENT(object_danpei_object)
|
||||
DECLARE_ROM_SEGMENT(object_dhouse)
|
||||
DECLARE_ROM_SEGMENT(object_hakaisi)
|
||||
DECLARE_ROM_SEGMENT(object_po)
|
||||
DECLARE_ROM_SEGMENT(object_snowman)
|
||||
DECLARE_ROM_SEGMENT(object_po_sisters)
|
||||
DECLARE_ROM_SEGMENT(object_pp)
|
||||
DECLARE_ROM_SEGMENT(object_goronswitch)
|
||||
DECLARE_ROM_SEGMENT(object_delf)
|
||||
DECLARE_ROM_SEGMENT(object_botihasira)
|
||||
DECLARE_ROM_SEGMENT(object_gi_bigbomb)
|
||||
DECLARE_ROM_SEGMENT(object_pst)
|
||||
DECLARE_ROM_SEGMENT(object_bsmask)
|
||||
DECLARE_ROM_SEGMENT(object_spidertent)
|
||||
DECLARE_ROM_SEGMENT(object_zoraegg)
|
||||
DECLARE_ROM_SEGMENT(object_kbt)
|
||||
DECLARE_ROM_SEGMENT(object_gg)
|
||||
DECLARE_ROM_SEGMENT(object_maruta)
|
||||
DECLARE_ROM_SEGMENT(object_ghaka)
|
||||
DECLARE_ROM_SEGMENT(object_oyu)
|
||||
DECLARE_ROM_SEGMENT(object_dnq)
|
||||
DECLARE_ROM_SEGMENT(object_dai)
|
||||
DECLARE_ROM_SEGMENT(object_kgy)
|
||||
DECLARE_ROM_SEGMENT(object_fb)
|
||||
DECLARE_ROM_SEGMENT(object_taisou)
|
||||
DECLARE_ROM_SEGMENT(object_gk)
|
||||
DECLARE_ROM_SEGMENT(object_haka_obj)
|
||||
DECLARE_ROM_SEGMENT(object_dnt)
|
||||
DECLARE_ROM_SEGMENT(object_yukiyama)
|
||||
DECLARE_ROM_SEGMENT(object_icefloe)
|
||||
DECLARE_ROM_SEGMENT(object_gi_gold_dust)
|
||||
DECLARE_ROM_SEGMENT(object_gi_bottle_16)
|
||||
DECLARE_ROM_SEGMENT(object_gi_bottle_22)
|
||||
DECLARE_ROM_SEGMENT(object_bee)
|
||||
DECLARE_ROM_SEGMENT(object_ot)
|
||||
DECLARE_ROM_SEGMENT(object_utubo)
|
||||
DECLARE_ROM_SEGMENT(object_dora)
|
||||
DECLARE_ROM_SEGMENT(object_gi_loach)
|
||||
DECLARE_ROM_SEGMENT(object_gi_seahorse)
|
||||
DECLARE_ROM_SEGMENT(object_bigpo)
|
||||
DECLARE_ROM_SEGMENT(object_hariko)
|
||||
DECLARE_ROM_SEGMENT(object_dnj)
|
||||
DECLARE_ROM_SEGMENT(object_sinkai_kabe)
|
||||
DECLARE_ROM_SEGMENT(object_kin2_obj)
|
||||
DECLARE_ROM_SEGMENT(object_ishi)
|
||||
DECLARE_ROM_SEGMENT(object_hakugin_demo)
|
||||
DECLARE_ROM_SEGMENT(object_jg)
|
||||
DECLARE_ROM_SEGMENT(object_gi_sword_2)
|
||||
DECLARE_ROM_SEGMENT(object_gi_sword_3)
|
||||
DECLARE_ROM_SEGMENT(object_gi_sword_4)
|
||||
DECLARE_ROM_SEGMENT(object_um)
|
||||
DECLARE_ROM_SEGMENT(object_rb)
|
||||
DECLARE_ROM_SEGMENT(object_mbar_obj)
|
||||
DECLARE_ROM_SEGMENT(object_ikana_obj)
|
||||
DECLARE_ROM_SEGMENT(object_kz)
|
||||
DECLARE_ROM_SEGMENT(object_tokei_turret)
|
||||
DECLARE_ROM_SEGMENT(object_zog)
|
||||
DECLARE_ROM_SEGMENT(object_rotlift)
|
||||
DECLARE_ROM_SEGMENT(object_posthouse_obj)
|
||||
DECLARE_ROM_SEGMENT(object_gi_mask09)
|
||||
DECLARE_ROM_SEGMENT(object_gi_mask14)
|
||||
DECLARE_ROM_SEGMENT(object_gi_mask15)
|
||||
DECLARE_ROM_SEGMENT(object_inibs_object)
|
||||
DECLARE_ROM_SEGMENT(object_tree)
|
||||
DECLARE_ROM_SEGMENT(object_kaizoku_obj)
|
||||
DECLARE_ROM_SEGMENT(object_gi_reserve_b_00)
|
||||
DECLARE_ROM_SEGMENT(object_gi_reserve_c_00)
|
||||
DECLARE_ROM_SEGMENT(object_zob)
|
||||
DECLARE_ROM_SEGMENT(object_milkbar)
|
||||
DECLARE_ROM_SEGMENT(object_dmask)
|
||||
DECLARE_ROM_SEGMENT(object_gi_reserve_c_01)
|
||||
DECLARE_ROM_SEGMENT(object_zod)
|
||||
DECLARE_ROM_SEGMENT(object_kumo30)
|
||||
DECLARE_ROM_SEGMENT(object_obj_yasi)
|
||||
DECLARE_ROM_SEGMENT(object_tanron1)
|
||||
DECLARE_ROM_SEGMENT(object_tanron2)
|
||||
DECLARE_ROM_SEGMENT(object_tanron3)
|
||||
DECLARE_ROM_SEGMENT(object_gi_magicmushroom)
|
||||
DECLARE_ROM_SEGMENT(object_obj_chan)
|
||||
DECLARE_ROM_SEGMENT(object_gi_mask10)
|
||||
DECLARE_ROM_SEGMENT(object_zos)
|
||||
DECLARE_ROM_SEGMENT(object_an2)
|
||||
DECLARE_ROM_SEGMENT(object_an3)
|
||||
DECLARE_ROM_SEGMENT(object_f40_switch)
|
||||
DECLARE_ROM_SEGMENT(object_lodmoon)
|
||||
DECLARE_ROM_SEGMENT(object_tro)
|
||||
DECLARE_ROM_SEGMENT(object_gi_mask12)
|
||||
DECLARE_ROM_SEGMENT(object_gi_mask23)
|
||||
DECLARE_ROM_SEGMENT(object_gi_bottle_21)
|
||||
DECLARE_ROM_SEGMENT(object_gi_camera)
|
||||
DECLARE_ROM_SEGMENT(object_kamejima)
|
||||
DECLARE_ROM_SEGMENT(object_nb)
|
||||
DECLARE_ROM_SEGMENT(object_harfgibud)
|
||||
DECLARE_ROM_SEGMENT(object_zov)
|
||||
DECLARE_ROM_SEGMENT(object_ah)
|
||||
DECLARE_ROM_SEGMENT(object_hgdoor)
|
||||
DECLARE_ROM_SEGMENT(object_dor01)
|
||||
DECLARE_ROM_SEGMENT(object_dor02)
|
||||
DECLARE_ROM_SEGMENT(object_dor03)
|
||||
DECLARE_ROM_SEGMENT(object_dor04)
|
||||
DECLARE_ROM_SEGMENT(object_last_obj)
|
||||
DECLARE_ROM_SEGMENT(object_redead_obj)
|
||||
DECLARE_ROM_SEGMENT(object_ikninside_obj)
|
||||
DECLARE_ROM_SEGMENT(object_iknv_obj)
|
||||
DECLARE_ROM_SEGMENT(object_pamera)
|
||||
DECLARE_ROM_SEGMENT(object_hsstump)
|
||||
DECLARE_ROM_SEGMENT(object_zm)
|
||||
DECLARE_ROM_SEGMENT(object_al)
|
||||
DECLARE_ROM_SEGMENT(object_tab)
|
||||
DECLARE_ROM_SEGMENT(object_secom_obj)
|
||||
DECLARE_ROM_SEGMENT(object_dt)
|
||||
DECLARE_ROM_SEGMENT(object_gi_mask03)
|
||||
DECLARE_ROM_SEGMENT(object_cha)
|
||||
DECLARE_ROM_SEGMENT(object_obj_dinner)
|
||||
DECLARE_ROM_SEGMENT(object_gi_reserve_b_01)
|
||||
DECLARE_ROM_SEGMENT(object_lastday)
|
||||
DECLARE_ROM_SEGMENT(object_bai)
|
||||
DECLARE_ROM_SEGMENT(object_ikn_demo)
|
||||
DECLARE_ROM_SEGMENT(object_gi_fieldmap)
|
||||
DECLARE_ROM_SEGMENT(object_big_fwall)
|
||||
DECLARE_ROM_SEGMENT(object_hunsui)
|
||||
DECLARE_ROM_SEGMENT(object_uch)
|
||||
DECLARE_ROM_SEGMENT(object_tanron4)
|
||||
DECLARE_ROM_SEGMENT(object_tanron5)
|
||||
DECLARE_ROM_SEGMENT(object_in2)
|
||||
DECLARE_ROM_SEGMENT(object_yb)
|
||||
DECLARE_ROM_SEGMENT(object_rz)
|
||||
DECLARE_ROM_SEGMENT(object_bjt)
|
||||
DECLARE_ROM_SEGMENT(object_taru)
|
||||
DECLARE_ROM_SEGMENT(object_moonston)
|
||||
DECLARE_ROM_SEGMENT(object_gi_schedule)
|
||||
DECLARE_ROM_SEGMENT(object_gi_stonemask)
|
||||
DECLARE_ROM_SEGMENT(object_zoraband)
|
||||
DECLARE_ROM_SEGMENT(object_kepn_koya)
|
||||
DECLARE_ROM_SEGMENT(object_obj_usiyane)
|
||||
DECLARE_ROM_SEGMENT(object_gi_mask05)
|
||||
DECLARE_ROM_SEGMENT(object_gi_mask11)
|
||||
DECLARE_ROM_SEGMENT(object_gi_mask20)
|
||||
DECLARE_ROM_SEGMENT(object_nnh)
|
||||
DECLARE_ROM_SEGMENT(object_kzsaku)
|
||||
DECLARE_ROM_SEGMENT(object_obj_milk_bin)
|
||||
DECLARE_ROM_SEGMENT(object_random_obj)
|
||||
DECLARE_ROM_SEGMENT(object_kujiya)
|
||||
DECLARE_ROM_SEGMENT(object_kitan)
|
||||
DECLARE_ROM_SEGMENT(object_gi_mask06)
|
||||
DECLARE_ROM_SEGMENT(object_gi_mask16)
|
||||
DECLARE_ROM_SEGMENT(object_astr_obj)
|
||||
DECLARE_ROM_SEGMENT(object_bsb)
|
||||
DECLARE_ROM_SEGMENT(object_fall2)
|
||||
DECLARE_ROM_SEGMENT(object_sth)
|
||||
DECLARE_ROM_SEGMENT(object_gi_mssa)
|
||||
DECLARE_ROM_SEGMENT(object_smtower)
|
||||
DECLARE_ROM_SEGMENT(object_gi_mask21)
|
||||
DECLARE_ROM_SEGMENT(object_yado_obj)
|
||||
DECLARE_ROM_SEGMENT(object_syoten)
|
||||
DECLARE_ROM_SEGMENT(object_moonend)
|
||||
DECLARE_ROM_SEGMENT(object_ob)
|
||||
DECLARE_ROM_SEGMENT(object_gi_bottle_04)
|
||||
DECLARE_ROM_SEGMENT(object_and)
|
||||
DECLARE_ROM_SEGMENT(object_obj_danpeilift)
|
||||
DECLARE_ROM_SEGMENT(object_drs)
|
||||
DECLARE_ROM_SEGMENT(object_msmo)
|
||||
DECLARE_ROM_SEGMENT(object_an4)
|
||||
DECLARE_ROM_SEGMENT(object_wdor01)
|
||||
DECLARE_ROM_SEGMENT(object_wdor02)
|
||||
DECLARE_ROM_SEGMENT(object_wdor03)
|
||||
DECLARE_ROM_SEGMENT(object_wdor04)
|
||||
DECLARE_ROM_SEGMENT(object_wdor05)
|
||||
DECLARE_ROM_SEGMENT(object_stk3)
|
||||
DECLARE_ROM_SEGMENT(object_kinsta1_obj)
|
||||
DECLARE_ROM_SEGMENT(object_kinsta2_obj)
|
||||
DECLARE_ROM_SEGMENT(object_bh)
|
||||
DECLARE_ROM_SEGMENT(object_gi_mask17)
|
||||
DECLARE_ROM_SEGMENT(object_gi_mask22)
|
||||
DECLARE_ROM_SEGMENT(object_lbfshot)
|
||||
DECLARE_ROM_SEGMENT(object_fusen)
|
||||
DECLARE_ROM_SEGMENT(object_ending_obj)
|
||||
DECLARE_ROM_SEGMENT(object_gi_mask13)
|
||||
#define DEFINE_OBJECT(name, _enumValue) DECLARE_ROM_SEGMENT(name)
|
||||
#define DEFINE_OBJECT_UNSET(_enumValue)
|
||||
#define DEFINE_OBJECT_SIZE_ZERO(_name, _enumValue)
|
||||
|
||||
#include "tables/object_table.h"
|
||||
|
||||
#undef DEFINE_OBJECT
|
||||
#undef DEFINE_OBJECT_UNSET
|
||||
#undef DEFINE_OBJECT_SIZE_ZERO
|
||||
|
||||
DECLARE_ROM_SEGMENT(scene_texture_01)
|
||||
DECLARE_ROM_SEGMENT(scene_texture_02)
|
||||
@@ -1121,4 +666,5 @@ DECLARE_ROM_SEGMENT(KAKUSIANA_room_13)
|
||||
DECLARE_ROM_SEGMENT(KAKUSIANA_room_14)
|
||||
|
||||
DECLARE_ROM_SEGMENT(bump_texture_static)
|
||||
|
||||
#endif
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+5
-2
@@ -657,8 +657,11 @@ extern u8 gItemSlots[];
|
||||
extern s16 gItemPrices[];
|
||||
extern u16 gSceneIdsPerRegion[11][27];
|
||||
extern u8 gPlayerFormItemRestrictions[PLAYER_FORM_MAX][114];
|
||||
extern s16 gPlayerFormObjectIndices[8];
|
||||
extern RomFile gObjectTable[643];
|
||||
|
||||
extern s16 gPlayerFormObjectIndices[PLAYER_FORM_MAX];
|
||||
extern ObjectId gObjectTableSize;
|
||||
extern RomFile gObjectTable[OBJECT_ID_MAX];
|
||||
|
||||
extern SceneTableEntry gSceneTable[];
|
||||
extern UNK_PTR D_801C5C50;
|
||||
// extern UNK_TYPE1 D_801C5C9C;
|
||||
|
||||
+11
-645
File diff suppressed because it is too large
Load Diff
@@ -513,7 +513,7 @@ beginseg
|
||||
pad_text
|
||||
include "build/data/code/code_801C2410.data.o"
|
||||
include "build/src/code/z_scene.o"
|
||||
include "build/data/code/code_801C2730.data.o"
|
||||
include "build/src/code/object_table.o"
|
||||
include "build/src/code/z_scene_proc.o"
|
||||
include "build/src/code/z_scene_table.o"
|
||||
include "build/src/code/z_schedule.o"
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
#include "global.h"
|
||||
|
||||
s16 gPlayerFormObjectIndices[PLAYER_FORM_MAX] = {
|
||||
OBJECT_LINK_BOY, // PLAYER_FORM_FIERCE_DEITY
|
||||
OBJECT_LINK_GORON, // PLAYER_FORM_GORON
|
||||
OBJECT_LINK_ZORA, // PLAYER_FORM_ZORA
|
||||
OBJECT_LINK_NUTS, // PLAYER_FORM_DEKU
|
||||
OBJECT_LINK_CHILD, // PLAYER_FORM_HUMAN
|
||||
};
|
||||
|
||||
ObjectId gObjectTableSize = OBJECT_ID_MAX;
|
||||
|
||||
// Object Table definition
|
||||
#define DEFINE_OBJECT(name, _enumValue) { SEGMENT_ROM_START(name), SEGMENT_ROM_END(name) },
|
||||
#define DEFINE_OBJECT_UNSET(_enumValue) { 0, 0 },
|
||||
#define DEFINE_OBJECT_SIZE_ZERO(name, _enumValue) { SEGMENT_ROM_START(name), SEGMENT_ROM_START(name) },
|
||||
|
||||
RomFile gObjectTable[] = {
|
||||
#include "tables/object_table.h"
|
||||
};
|
||||
|
||||
#undef DEFINE_OBJECT
|
||||
#undef DEFINE_OBJECT_UNSET
|
||||
#undef DEFINE_OBJECT_SIZE_ZERO
|
||||
@@ -3,6 +3,7 @@
|
||||
* Overlay: ovl_En_Fishing
|
||||
* Description: Fishing Pond Elements (Owner, Fish, Props, Effects...)
|
||||
*/
|
||||
|
||||
#include "prevent_bss_reordering.h"
|
||||
#include "z_en_fishing.h"
|
||||
#include "z64rumble.h"
|
||||
|
||||
@@ -554,7 +554,7 @@
|
||||
0x801C1D30 : "code_8012EC80",
|
||||
0x801C2410 : "code_801C2410",
|
||||
0x801C2650 : "z_scene",
|
||||
0x801C2730 : "",
|
||||
0x801C2730 : "object_table",
|
||||
0x801C3B60 : "z_scene_proc",
|
||||
0x801C3CA0 : "z_scene_table",
|
||||
0x801C5C50 : "z_schedule",
|
||||
|
||||
@@ -1360,7 +1360,8 @@
|
||||
0x801C2650:("tatlMessageFiles","RomFile","[2]",0x10),
|
||||
0x801C2660:("sceneTextureFiles","RomFile","[9]",0x48),
|
||||
0x801C26A8:("sceneHeaderFuncTable","scene_header_func","[31]",0x7c),
|
||||
0x801C2730:("gPlayerFormObjectIndices","s16","[8]",0x10),
|
||||
0x801C2730:("gPlayerFormObjectIndices","s16","[5]",0xA),
|
||||
0x801C273C:("gObjectTableSize","ObjectId","",0x4),
|
||||
0x801C2740:("gObjectTable","RomFile","[643]",0x1418),
|
||||
0x801C3B60:("sSceneDrawDefaultDl","Gfx","[11]",0x58),
|
||||
0x801C3BB8:("gSceneProcSceneDrawFuncs","SceneDrawConfigFunc","[8]",0x20),
|
||||
|
||||
Reference in New Issue
Block a user