From d38ac6a9d32e9b5c0e3caafbfc8d311a0f8f51f4 Mon Sep 17 00:00:00 2001 From: kuchenmitsahne <25233413+kuchenmitsahne@users.noreply.github.com> Date: Tue, 26 Nov 2024 10:37:21 -0500 Subject: ac_hanami_npc0 OK (#227) * Standard actor functions and aHM0_ct_data functions OK * Add scaffolding to Hanami_Npc0 struct * func_809DE830_jp OK * func_809DE434, func_809DE4A0_jp, func_809DE5BC_jp, func_809DE6B4_jp, func_809DE6C8_jp, func_809DE6EC_jp OK * func_809DE538_jp OK with warnings * func_809DE538_jp OK * func_809DE714_jp OK with warnings * func_809DE7D0_jp OK * func_809DE8D0 OK * func_809DE56C_jp OK with warnings * func_809DE800_jp OK * func_809DE978_jp OK * func_809DE948_jp OK * func_809DE744_jp OK * func_809DE5DC_jp progress (nonmatching) * Remove fake symbol D_809DEB1C_jp. * Prepare for data import * func_809DE5DC_jp OK, update func_809DE6EC_jp (all functions matching) * Import data (44 differing words) * Fix struct_809AEFA4, ac_hanami_npc0 OK * Rename symbols + initial style pass * Unify aHM0_*_proc function signatures * Resolve warnings in aHM0_merry * Update NPC actor functions + corresponding clip functions to use ActorFunc signature * Fix aHM0_make_tumbler warning (none remain); minor cleanup * Avoid format.py strangeness * Fix typedef order --- linker_scripts/jp/symbol_addrs_overlays.txt | 71 ++++++++++++++--------------- 1 file changed, 35 insertions(+), 36 deletions(-) (limited to 'linker_scripts') diff --git a/linker_scripts/jp/symbol_addrs_overlays.txt b/linker_scripts/jp/symbol_addrs_overlays.txt index 60b924d..122f60f 100644 --- a/linker_scripts/jp/symbol_addrs_overlays.txt +++ b/linker_scripts/jp/symbol_addrs_overlays.txt @@ -12711,46 +12711,45 @@ aHM0_actor_ct = 0x809DE340; // type:func aHM0_actor_save = 0x809DE3B0; // type:func aHM0_actor_dt = 0x809DE3DC; // type:func aHM0_actor_init = 0x809DE408; // type:func -func_809DE434_jp = 0x809DE434; // type:func -func_809DE474_jp = 0x809DE474; // type:func -func_809DE4A0_jp = 0x809DE4A0; // type:func -func_809DE4C0_jp = 0x809DE4C0; // type:func -func_809DE538_jp = 0x809DE538; // type:func -func_809DE56C_jp = 0x809DE56C; // type:func -func_809DE5BC_jp = 0x809DE5BC; // type:func -func_809DE5DC_jp = 0x809DE5DC; // type:func -func_809DE6B4_jp = 0x809DE6B4; // type:func -func_809DE6C8_jp = 0x809DE6C8; // type:func -func_809DE6EC_jp = 0x809DE6EC; // type:func -func_809DE714_jp = 0x809DE714; // type:func -func_809DE744_jp = 0x809DE744; // type:func -func_809DE7D0_jp = 0x809DE7D0; // type:func -func_809DE800_jp = 0x809DE800; // type:func -func_809DE830_jp = 0x809DE830; // type:func -func_809DE8D0_jp = 0x809DE8D0; // type:func -func_809DE948_jp = 0x809DE948; // type:func -func_809DE978_jp = 0x809DE978; // type:func -func_809DE9EC_jp = 0x809DE9EC; // type:func -func_809DEA20_jp = 0x809DEA20; // type:func -func_809DEA4C_jp = 0x809DEA4C; // type:func -func_809DEA8C_jp = 0x809DEA8C; // type:func +aHM0_set_animation = 0x809DE434; // type:func +aHM0_actor_move = 0x809DE474; // type:func +aHM0_set_request_act = 0x809DE4A0; // type:func +aHM0_make_tumbler = 0x809DE4C0; // type:func +aHM0_wait = 0x809DE538; // type:func +aHM0_merry = 0x809DE56C; // type:func +aHM0_drink = 0x809DE5BC; // type:func +aHM0_setupAction = 0x809DE5DC; // type:func +aHM0_act_chg_data_proc = 0x809DE6B4; // type:func +aHM0_act_init_proc = 0x809DE6C8; // type:func +aHM0_act_main_proc = 0x809DE6EC; // type:func +aHM0_act_proc = 0x809DE714; // type:func +aHM0_think_main_proc = 0x809DE744; // type:func +aHM0_think_init_proc = 0x809DE7D0; // type:func +aHM0_think_proc = 0x809DE800; // type:func +aHM0_schedule_init_proc = 0x809DE830; // type:func +aHM0_schedule_main_proc = 0x809DE8D0; // type:func +aHM0_schedule_proc = 0x809DE948; // type:func +aHM0_set_talk_info = 0x809DE978; // type:func +aHM0_talk_request = 0x809DE9EC; // type:func +aHM0_talk_init = 0x809DEA20; // type:func +aHM0_talk_end_chk = 0x809DEA4C; // type:func +aHM0_actor_draw = 0x809DEA8C; // type:func // .data Hanami_Npc0_Profile = 0x809DEAC0; // -D_809DEAE4_jp = 0x809DEAE4; // -D_809DEB00_jp = 0x809DEB00; // -D_809DEB0C_jp = 0x809DEB0C; // -D_809DEB18_jp = 0x809DEB18; // -D_809DEB1C_jp = 0x809DEB1C; // -D_FLT_809DEB24_jp = 0x809DEB24; // type:f32 -D_809DEB30_jp = 0x809DEB30; // type:u8 -D_809DEB34_jp = 0x809DEB34; // -D_809DEB40_jp = 0x809DEB40; // -D_809DEB4C_jp = 0x809DEB4C; // -D_809DEB54_jp = 0x809DEB54; // type:s16 -D_809DEB5C_jp = 0x809DEB5C; // -D_809DEB64_jp = 0x809DEB64; // +aHM0_ct_data = 0x809DEAE4; // +animeSeqNo = 0x809DEB00; // allow_duplicated:true +process = 0x809DEB0C; // allow_duplicated:true +anm_loop_base = 0x809DEB18; // size:0xC allow_duplicated:true +anm_loop_rnd = 0x809DEB24; // type:f32 allow_duplicated:true +clap_se_no = 0x809DEB30; // type:u8 allow_duplicated:true +act_proc = 0x809DEB34; // allow_duplicated:true +action = 0x809DEB40; // allow_duplicated:true +think_proc = 0x809DEB4C; // allow_duplicated:true +def_angle = 0x809DEB54; // type:s16 allow_duplicated:true +sche_proc = 0x809DEB5C; // allow_duplicated:true +msg_base = 0x809DEB64; // allow_duplicated:true // .text -- cgit v1.2.3