diff options
| author | emilybrooks <emilybrooksemilybrooks@gmail.com> | 2024-02-06 18:49:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-06 18:49:33 -0700 |
| commit | 1d31ba9ecd3efbe7585e000a2876624f4f7df322 (patch) | |
| tree | c1fef3e1640a743358dc4ed30418d8232864ab26 /linker_scripts | |
| parent | 24074d678d5d87a987bbda221f7da1a0dd02ea35 (diff) | |
ac_koinobori OK (#140)
* initial commit
* everything but draw
* fully matching
* imported data
* fixed errors
* review
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/jp/symbol_addrs_code.txt | 2 | ||||
| -rw-r--r-- | linker_scripts/jp/symbol_addrs_overlays.txt | 23 | ||||
| -rw-r--r-- | linker_scripts/jp/undefined_syms.ld | 6 |
3 files changed, 17 insertions, 14 deletions
diff --git a/linker_scripts/jp/symbol_addrs_code.txt b/linker_scripts/jp/symbol_addrs_code.txt index d37c324..7ef76c5 100644 --- a/linker_scripts/jp/symbol_addrs_code.txt +++ b/linker_scripts/jp/symbol_addrs_code.txt @@ -2885,7 +2885,7 @@ _texture_z_light_fog_prim_shadow = 0x800BD510; // type:func func_800BD538_jp = 0x800BD538; // type:func _texture_z_light_fog_prim_xlu = 0x800BD598; // type:func func_800BD5C0_jp = 0x800BD5C0; // type:func -func_800BD5E8_jp = 0x800BD5E8; // type:func +_texture_z_light_fog_prim_npc = 0x800BD5E8; // type:func func_800BD648_jp = 0x800BD648; // type:func func_800BD68C_jp = 0x800BD68C; // type:func func_800BD6D0_jp = 0x800BD6D0; // type:func diff --git a/linker_scripts/jp/symbol_addrs_overlays.txt b/linker_scripts/jp/symbol_addrs_overlays.txt index 1b86cf1..628c4a7 100644 --- a/linker_scripts/jp/symbol_addrs_overlays.txt +++ b/linker_scripts/jp/symbol_addrs_overlays.txt @@ -14456,7 +14456,7 @@ aTHB_actor_draw = 0x80A1FF58; // type:func T_Hanabi_Profile = 0x80A20050; // aim = 0x80A20074; // type:f32 -process = 0x80A2007C; // +process = 0x80A2007C; // allow_duplicated:true start_scale = 0x80A20090; // type:f32 D_80A200A4_jp = 0x80A200A4; // @@ -20275,24 +20275,21 @@ RO_FLT_80A93464_jp = 0x80A93464; // type:f32 aKOI_actor_ct = 0x80A93570; // type:func aKOI_actor_dt = 0x80A93604; // type:func -func_80A9369C_jp = 0x80A9369C; // type:func -func_80A936AC_jp = 0x80A936AC; // type:func -func_80A936BC_jp = 0x80A936BC; // type:func -func_80A9373C_jp = 0x80A9373C; // type:func +aKOI_set_bgOffset = 0x80A9369C; // type:func +aKOI_wait = 0x80A936AC; // type:func +aKOI_setup_action = 0x80A936BC; // type:func +aKOI_actor_move = 0x80A9373C; // type:func aKOI_actor_init = 0x80A93870; // type:func aKOI_actor_draw = 0x80A938D8; // type:func // .data Koinobori_Profile = 0x80A93A70; // -D_80A93A94_jp = 0x80A93A94; // -D_80A93A9C_jp = 0x80A93A9C; // -D_80A93AB0_jp = 0x80A93AB0; // -D_80A93AB4_jp = 0x80A93AB4; // -D_80A93AD4_jp = 0x80A93AD4; // -D_80A93B70_jp = 0x80A93B70; // -D_80A93BE0_jp = 0x80A93BE0; // -D_80A93C50_jp = 0x80A93C50; // +aKOI_shadow_vtx_fix_flg_table = 0x80A93A94; // +aKOI_shadow_data = 0x80A93A9C; // +process = 0x80A93AB0; // allow_duplicated:true +aKOI_obj_e_koinobori_a_pal = 0x80A93AB4; // +obj_e_koinobori_b_pal = 0x80A93AD4; // // .text diff --git a/linker_scripts/jp/undefined_syms.ld b/linker_scripts/jp/undefined_syms.ld index aa342de..7eea191 100644 --- a/linker_scripts/jp/undefined_syms.ld +++ b/linker_scripts/jp/undefined_syms.ld @@ -5669,6 +5669,12 @@ cKF_ba_r_obj_w_toudai = 0x06080A74; obj_s_toudai_light_model = 0x0607E188; obj_w_toudai_light_model = 0x0607FD90; +// ac_koinobori +obj_e_koinobori_shadow_v = 0x06001DC8; // +obj_e_koinobori_shadowT_model = 0x06001E48; // +cKF_bs_r_obj_e_koinobori = 0x0601F22C; // +cKF_ba_r_obj_e_koinobori = 0x0601F6D4; // + // Buffers D_801524C0_jp = 0x801524C0; // |