ac_hanami_npc1 OK (#228)

* Rename symbols

* First pass on struct Hanami_Npc1

* Actor funcs (ct, save, dt, init, draw) OK

* Add trailing member to struct_809AEFA4

* Update Clip_unk_040_unk_E4 typedef to ActorFunc signature in order to unify *_actor_draw signatures

* All talk functions and proc functions (minus aHM1_think_main_proc.s) OK

* mFI_GetPuleIdx (func_8008930C_jp) OK; rename symbols (m_field_info)

* aHM1_set_animation OK

* aHM1_actor_move OK; update *_actor_move function signature to ActorFunc across project

* aHM1_set_request_act, aHM1_check_moveRange OK

* aHM1_check_inBlock OK; fix style in aHM1_check_moveRange

* aHM1_turn, aHM1_walk, aHM1_set_spd_info OK

* aHM1_think_init_proc OK

* aHM1_revise_moveRange OK with fake (all functions matching)

* Remove extraneous prototypes

* Fix aHM1_think_main_proc signature

* Import data

* Fix aHM1_revise_moveRange signature

* Standardize actor accesses

* Improve define usage

* Name blockX and blockZ members in Actor struct

* Remove extraneous comments

* mFI_BkNum2WposXZ OK (m_field_info)

* Add defines to m_field_info

* Formatting pass

* Remove extraneous comments

* Fix unk_18 type in struct_809AEFA4

---------

Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>

2 files changed, 38 insertions, 38 deletions

diff --git a/linker_scripts/jp/symbol_addrs_code.txt b/linker_scripts/jp/symbol_addrs_code.txt
index 5a146be..d83cf9a 100644
--- a/linker_scripts/jp/symbol_addrs_code.txt
+++ b/linker_scripts/jp/symbol_addrs_code.txt
@@ -1309,7 +1309,7 @@ func_80087ED0_jp = 0x80087ED0; // type:func
 func_80088018_jp = 0x80088018; // type:func
 func_80088160_jp = 0x80088160; // type:func
 func_8008819C_jp = 0x8008819C; // type:func
-func_800881AC_jp = 0x800881AC; // type:func
+mFI_BlockCheck = 0x800881AC; // type:func
 func_80088270_jp = 0x80088270; // type:func
 func_800882AC_jp = 0x800882AC; // type:func
 func_800882FC_jp = 0x800882FC; // type:func
@@ -1325,7 +1325,7 @@ func_800888AC_jp = 0x800888AC; // type:func
 func_80088938_jp = 0x80088938; // type:func
 func_800889D8_jp = 0x800889D8; // type:func
 func_80088A58_jp = 0x80088A58; // type:func
-func_80088B3C_jp = 0x80088B3C; // type:func
+mFI_BkNum2WposXZ = 0x80088B3C; // type:func
 mFI_UtNum2PosXZInBk = 0x80088BC0; // type:func
 func_80088BFC_jp = 0x80088BFC; // type:func
 mFI_BkandUtNum2CenterWpos = 0x80088C74; // type:func
@@ -1346,8 +1346,8 @@ func_8008907C_jp = 0x8008907C; // type:func
 func_80089114_jp = 0x80089114; // type:func
 func_800891AC_jp = 0x800891AC; // type:func
 mFI_BkNum2BlockType = 0x80089268; // type:func
-func_800892CC_jp = 0x800892CC; // type:func
-func_8008930C_jp = 0x8008930C; // type:func
+mFI_GetPuleTypeIdx = 0x800892CC; // type:func
+mFI_GetPuleIdx = 0x8008930C; // type:func
 func_80089348_jp = 0x80089348; // type:func
 func_800893C8_jp = 0x800893C8; // type:func
 mFI_CheckBlockKind_OR = 0x80089404; // type:func
diff --git a/linker_scripts/jp/symbol_addrs_overlays.txt b/linker_scripts/jp/symbol_addrs_overlays.txt
index 122f60f..493db2a 100644
--- a/linker_scripts/jp/symbol_addrs_overlays.txt
+++ b/linker_scripts/jp/symbol_addrs_overlays.txt
@@ -12757,44 +12757,44 @@ aHM1_actor_ct = 0x809DEC90; // type:func
 aHM1_actor_save = 0x809DED00; // type:func
 aHM1_actor_dt = 0x809DED2C; // type:func
 aHM1_actor_init = 0x809DED58; // type:func
-func_809DED84_jp = 0x809DED84; // type:func
-func_809DEDC4_jp = 0x809DEDC4; // type:func
-func_809DEDF0_jp = 0x809DEDF0; // type:func
-func_809DEE10_jp = 0x809DEE10; // type:func
-func_809DEE60_jp = 0x809DEE60; // type:func
-func_809DEEEC_jp = 0x809DEEEC; // type:func
-func_809DF028_jp = 0x809DF028; // type:func
-func_809DF074_jp = 0x809DF074; // type:func
-func_809DF0EC_jp = 0x809DF0EC; // type:func
-func_809DF134_jp = 0x809DF134; // type:func
-func_809DF180_jp = 0x809DF180; // type:func
-func_809DF194_jp = 0x809DF194; // type:func
-func_809DF1B8_jp = 0x809DF1B8; // type:func
-func_809DF1E0_jp = 0x809DF1E0; // type:func
-func_809DF210_jp = 0x809DF210; // type:func
-func_809DF30C_jp = 0x809DF30C; // type:func
-func_809DF33C_jp = 0x809DF33C; // type:func
-func_809DF36C_jp = 0x809DF36C; // type:func
-func_809DF3FC_jp = 0x809DF3FC; // type:func
-func_809DF468_jp = 0x809DF468; // type:func
-func_809DF498_jp = 0x809DF498; // type:func
-func_809DF4F0_jp = 0x809DF4F0; // type:func
-func_809DF524_jp = 0x809DF524; // type:func
-func_809DF550_jp = 0x809DF550; // type:func
-func_809DF590_jp = 0x809DF590; // type:func
+aHM1_set_animation = 0x809DED84; // type:func
+aHM1_actor_move = 0x809DEDC4; // type:func
+aHM1_set_request_act = 0x809DEDF0; // type:func
+aHM1_check_moveRange = 0x809DEE10; // type:func
+aHM1_check_inBlock = 0x809DEE60; // type:func
+aHM1_revise_moveRange = 0x809DEEEC; // type:func
+aHM1_turn = 0x809DF028; // type:func
+aHM1_walk = 0x809DF074; // type:func
+aHM1_set_spd_info = 0x809DF0EC; // type:func
+aHM1_setupAction = 0x809DF134; // type:func
+aHM1_act_chg_data_proc = 0x809DF180; // type:func
+aHM1_act_init_proc = 0x809DF194; // type:func
+aHM1_act_main_proc = 0x809DF1B8; // type:func
+aHM1_act_proc = 0x809DF1E0; // type:func
+aHM1_think_main_proc = 0x809DF210; // type:func
+aHM1_think_init_proc = 0x809DF30C; // type:func
+aHM1_think_proc = 0x809DF33C; // type:func
+aHM1_schedule_init_proc = 0x809DF36C; // type:func
+aHM1_schedule_main_proc = 0x809DF3FC; // type:func
+aHM1_schedule_proc = 0x809DF468; // type:func
+aHM1_set_talk_info = 0x809DF498; // type:func
+aHM1_talk_request = 0x809DF4F0; // type:func
+aHM1_talk_init = 0x809DF524; // type:func
+aHM1_talk_end_chk = 0x809DF550; // type:func
+aHM1_actor_draw = 0x809DF590; // type:func
 
 // .data
 
 Hanami_Npc1_Profile = 0x809DF5C0; //
-D_809DF5E4_jp = 0x809DF5E4; //
-D_809DF600_jp = 0x809DF600; //
-D_FLT_809DF608_jp = 0x809DF608; // type:f32
-D_809DF610_jp = 0x809DF610; //
-D_809DF618_jp = 0x809DF618; //
-D_809DF624_jp = 0x809DF624; //
-D_809DF62C_jp = 0x809DF62C; // type:s16
-D_809DF63C_jp = 0x809DF63C; //
-D_809DF644_jp = 0x809DF644; //
+aHM1_ct_data = 0x809DF5E4; //
+animeSeqNo = 0x809DF600; // allow_duplicated:true
+offset = 0x809DF608; // type:f32 allow_duplicated:true
+process = 0x809DF610; // allow_duplicated:true
+act_proc = 0x809DF618; // allow_duplicated:true
+think_proc = 0x809DF624; // allow_duplicated:true
+def_angle = 0x809DF62C; // type:s16 size:0xE allow_duplicated:true
+sche_proc = 0x809DF63C; // allow_duplicated:true
+msg_base = 0x809DF644; // size:0x18 allow_duplicated:true
 
 // .rodata