diff options
| author | emilybrooks <emilybrooksemilybrooks@gmail.com> | 2023-09-11 11:02:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-11 11:02:09 -0700 |
| commit | 2b9ed4a58d80024d0d9b7232e92ebf9ef6160bda (patch) | |
| tree | 2e9d674bde9ee6c430faf6595e336731210df8c8 /linker_scripts | |
| parent | 1b465cfe8b3f228faa08fba8d58a8d3be6e82d06 (diff) | |
ac_toudai matched 12 functions, 2 non-equivalent (#65)
* first commit
* matched the gSegments thing
* more progress
* matched aTOU_actor_dt
* matched aTOU_set_bgOffset and imported data
* named everything
* cleanup, work on draw functions
* cleanup
* review
* Revert "review"
This reverts commit 229788b68359cb9ff3c372639c767e4e08011d96.
* format
* removed change to ac_structure.h
* temp changing data symbols
* format
* review
* fix conflicts
* fix season u32 thing
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/jp/symbol_addrs_overlays.txt | 45 | ||||
| -rw-r--r-- | linker_scripts/jp/undefined_syms.ld | 11 |
2 files changed, 32 insertions, 24 deletions
diff --git a/linker_scripts/jp/symbol_addrs_overlays.txt b/linker_scripts/jp/symbol_addrs_overlays.txt index 3d8edeb..6f7430b 100644 --- a/linker_scripts/jp/symbol_addrs_overlays.txt +++ b/linker_scripts/jp/symbol_addrs_overlays.txt @@ -21499,36 +21499,33 @@ D_80AAB294_jp = 0x80AAB294; // aTOU_actor_ct = 0x80AAB300; // type:func aTOU_actor_dt = 0x80AAB3D0; // type:func -func_80AAB488_jp = 0x80AAB488; // type:func -func_80AAB60C_jp = 0x80AAB60C; // type:func -func_80AAB81C_jp = 0x80AAB81C; // type:func -func_80AAB840_jp = 0x80AAB840; // type:func -func_80AAB894_jp = 0x80AAB894; // type:func -func_80AAB8D8_jp = 0x80AAB8D8; // type:func -func_80AAB918_jp = 0x80AAB918; // type:func -func_80AAB9C8_jp = 0x80AAB9C8; // type:func +aTOU_set_bgOffset = 0x80AAB488; // type:func +aTOU_color_ctrl = 0x80AAB60C; // type:func +aTOU_init = 0x80AAB81C; // type:func +aTOU_wait = 0x80AAB840; // type:func +aTOU_lighting = 0x80AAB894; // type:func +aTOU_lightout = 0x80AAB8D8; // type:func +aTOU_setup_action = 0x80AAB918; // type:func +aTOU_actor_move = 0x80AAB9C8; // type:func aTOU_actor_init = 0x80AABA50; // type:func -func_80AABAB8_jp = 0x80AABAB8; // type:func -func_80AABAD8_jp = 0x80AABAD8; // type:func +aTOU_actor_draw_before = 0x80AABAB8; // type:func +aTOU_actor_draw_after = 0x80AABAD8; // type:func aTOU_actor_draw = 0x80AABEB0; // type:func // .data Toudai_Profile = 0x80AAC060; // -D_80AAC084_jp = 0x80AAC084; // -D_80AAC098_jp = 0x80AAC098; // -D_80AAC0AC_jp = 0x80AAC0AC; // -D_80AAC0B4_jp = 0x80AAC0B4; // -D_80AAC0D0_jp = 0x80AAC0D0; // -D_FLT_80AAC0D8_jp = 0x80AAC0D8; // type:f32 -D_FLT_80AAC0E0_jp = 0x80AAC0E0; // type:f32 -D_80AAC0E8_jp = 0x80AAC0E8; // -D_80AAC0F0_jp = 0x80AAC0F0; // -D_80AAC100_jp = 0x80AAC100; // -D_80AAC108_jp = 0x80AAC108; // type:u8 -D_80AAC109_jp = 0x80AAC109; // type:u8 -D_80AAC10A_jp = 0x80AAC10A; // type:s8 -D_80AAC10B_jp = 0x80AAC10B; // type:s8 +aTOU_shadow_vtx_fix_flg_table = 0x80AAC084; // +aTOU_shadow_data = 0x80AAC098; // +skl_324 = 0x80AAC0AC; // +height_table_ct_360 = 0x80AAC0B4; // +height_table_361 = 0x80AAC0D0; // +addX_362 = 0x80AAC0D8; // type:f32 +addZ_363 = 0x80AAC0E0; // type:f32 +ani_484 = 0x80AAC0E8; // +process_485 = 0x80AAC0F0; // +mdl_519 = 0x80AAC100; // +prmcol_520 = 0x80AAC108; // // .rodata diff --git a/linker_scripts/jp/undefined_syms.ld b/linker_scripts/jp/undefined_syms.ld index 8588297..7467a43 100644 --- a/linker_scripts/jp/undefined_syms.ld +++ b/linker_scripts/jp/undefined_syms.ld @@ -5707,6 +5707,17 @@ D_C001660 = 0x0C001660; D_C004660 = 0x0C004660; D_C012370 = 0x0C012370; +// ac_toudai + +obj_s_toudai_shadow_v = 0x060089C8; +obj_s_toudai_shadow_1_model = 0x06008B08; +cKF_bs_r_obj_s_toudai = 0x0607EE1C; +cKF_bs_r_obj_w_toudai = 0x06080A24; +cKF_ba_r_obj_s_toudai = 0x0607EE6C; +cKF_ba_r_obj_w_toudai = 0x06080A74; +obj_s_toudai_light_model = 0x0607E188; +obj_w_toudai_light_model = 0x0607FD90; + // Buffers |