summaryrefslogtreecommitdiff
path: root/linker_scripts
diff options
context:
space:
mode:
authorAnghelo Carvajal <angheloalf95@gmail.com>2023-08-14 18:35:04 -0400
committerGitHub <noreply@github.com>2023-08-14 15:35:04 -0700
commitf19df74c6ee597f01c3d7def1fdef105d9bdef92 (patch)
tree0e9eef519791ed6612c05295a4e077f7667da199 /linker_scripts
parentbdb8ef6d5b33c24580d7861c4ccf8d937caac8fb (diff)
`m_actor.c` with 1 NON_MATCHING (#49)
* C file * drafts * Actor_info_ct and Actor_info_dt * Actor_info_make_actor draft * new_var = &argC; * func_80057940_jp * Actor_free_overlay_area, actor_free_check, Actor_get_overlay_area, func_80057940_jp, Actor_data_bank_regist_check * Shape_Info_init * Actor struct's size confirmed, Actor_malloc_actor_class and Actor_init_actor_class * func_80056380_jp, Actor_info_part_new, restore_fgdata, Actor_info_delete * Actor_info_draw_actor * Actor_data_bank_dma_end_check, Actor_draw_actor_no_culling_check, Actor_draw_actor_no_culling_check2, Actor_cull_check, Actor_delete_check, Actor_info_make_child_actor, restore_fgdata_all, Actor_info_save_actor * gSegments * Actor_world_to_eye, Actor_position_speed_set, Actor_position_moveF and func_80057B70_jp * Actor_player_look_direction_check * Actor_position_move * find m_kankyo file split * Actor_ct * fgName * projection_pos_set, Actor_display_position_set * Actor_info_call_actor * func_80057A8C_jp * import data and bss * cleanups * more cleanup * format * and even more cleanup * hilite funcs * Part_Break_init * and more cleanup * Actor_draw * fake stuff * Part_Break stuff from OoT * a * fix * fix fake symbol * fix * fix
Diffstat (limited to 'linker_scripts')
-rw-r--r--linker_scripts/jp/symbol_addrs_code.txt46
-rw-r--r--linker_scripts/jp/symbol_addrs_overlays.txt11
2 files changed, 27 insertions, 30 deletions
diff --git a/linker_scripts/jp/symbol_addrs_code.txt b/linker_scripts/jp/symbol_addrs_code.txt
index 3dd3881..a6a76a6 100644
--- a/linker_scripts/jp/symbol_addrs_code.txt
+++ b/linker_scripts/jp/symbol_addrs_code.txt
@@ -915,7 +915,7 @@ func_80078748_jp = 0x80078748; // type:func
func_800787E8_jp = 0x800787E8; // type:func
CollisionCheck_Status_ct = 0x800788DC; // type:func
CollisionCheck_Status_Clear = 0x8007891C; // type:func
-func_80078948_jp = 0x80078948; // type:func
+CollisionCheck_Status_set3 = 0x80078948; // type:func
CollisionCheck_Uty_ActorWorldPosSetPipeC = 0x80078978; // type:func
func_800789BC_jp = 0x800789BC; // type:func
common_data_reinit = 0x80078A10; // type:func
@@ -1710,16 +1710,16 @@ func_80096B2C_jp = 0x80096B2C; // type:func
func_80096B4C_jp = 0x80096B4C; // type:func
func_80096B64_jp = 0x80096B64; // type:func
func_80096BF0_jp = 0x80096BF0; // type:func
-func_80096C90_jp = 0x80096C90; // type:func
+mEnv_regist_nature = 0x80096C90; // type:func
func_80096CA0_jp = 0x80096CA0; // type:func
func_80096CDC_jp = 0x80096CDC; // type:func
func_80096D60_jp = 0x80096D60; // type:func
func_80096F5C_jp = 0x80096F5C; // type:func
func_80097048_jp = 0x80097048; // type:func
-func_800970D4_jp = 0x800970D4; // type:func
-func_80097108_jp = 0x80097108; // type:func
-func_800971B4_jp = 0x800971B4; // type:func
-func_80097510_jp = 0x80097510; // type:func
+mEnv_RoomTypeLightSet = 0x800970D4; // type:func
+Global_kankyo_ct = 0x80097108; // type:func
+mEnv_MakeShadowInfo = 0x800971B4; // type:func
+mEnv_set_time = 0x80097510; // type:func
func_800976BC_jp = 0x800976BC; // type:func
func_80097738_jp = 0x80097738; // type:func
func_800978EC_jp = 0x800978EC; // type:func
@@ -1747,7 +1747,7 @@ func_80098B50_jp = 0x80098B50; // type:func
func_80098CCC_jp = 0x80098CCC; // type:func
func_80098D88_jp = 0x80098D88; // type:func
func_80098DE0_jp = 0x80098DE0; // type:func
-func_80098EE4_jp = 0x80098EE4; // type:func
+mEnv_NowWeather = 0x80098EE4; // type:func
func_80098F68_jp = 0x80098F68; // type:func
func_80098FF0_jp = 0x80098FF0; // type:func
func_800990A8_jp = 0x800990A8; // type:func
@@ -1762,7 +1762,7 @@ func_800996CC_jp = 0x800996CC; // type:func
mEnv_GetShadowPrimColor_Light = 0x800996F8; // type:func
func_80099718_jp = 0x80099718; // type:func
func_80099728_jp = 0x80099728; // type:func
-func_80099770_jp = 0x80099770; // type:func
+mEnv_MakeWindowLightAlpha = 0x80099770; // type:func
func_800998AC_jp = 0x800998AC; // type:func
mem_copy = 0x800998C0; // type:func
mem_clear = 0x8009992C; // type:func
@@ -1837,10 +1837,10 @@ func_8009B504_jp = 0x8009B504; // type:func
func_8009B534_jp = 0x8009B534; // type:func
func_8009B72C_jp = 0x8009B72C; // type:func
func_8009B81C_jp = 0x8009B81C; // type:func
-func_8009B884_jp = 0x8009B884; // type:func
+LightsN_list_check = 0x8009B884; // type:func
func_8009B954_jp = 0x8009B954; // type:func
func_8009B9E0_jp = 0x8009B9E0; // type:func
-func_8009BA28_jp = 0x8009BA28; // type:func
+Global_light_ct = 0x8009BA28; // type:func
func_8009BA94_jp = 0x8009BA94; // type:func
func_8009BAC0_jp = 0x8009BAC0; // type:func
Global_light_read = 0x8009BAFC; // type:func
@@ -2441,7 +2441,7 @@ func_800AEB50_jp = 0x800AEB50; // type:func
func_800AEB9C_jp = 0x800AEB9C; // type:func
func_800AEBC8_jp = 0x800AEBC8; // type:func
func_800AEC74_jp = 0x800AEC74; // type:func
-func_800AED08_jp = 0x800AED08; // type:func
+mNPS_schedule_manager = 0x800AED08; // type:func
func_800AED68_jp = 0x800AED68; // type:func
func_800AEDD0_jp = 0x800AEDD0; // type:func
func_800AEE38_jp = 0x800AEE38; // type:func
@@ -3093,16 +3093,16 @@ func_800C6144_jp = 0x800C6144; // type:func
mSc_regist_initial_exchange_bank = 0x800C61CC; // type:func
func_800C62C4_jp = 0x800C62C4; // type:func
func_800C639C_jp = 0x800C639C; // type:func
-func_800C65E4_jp = 0x800C65E4; // type:func
-func_800C6678_jp = 0x800C6678; // type:func
+mSc_data_bank_ct = 0x800C65E4; // type:func
+mSc_decide_exchange_bank = 0x800C6678; // type:func
func_800C6690_jp = 0x800C6690; // type:func
-func_800C68C8_jp = 0x800C68C8; // type:func
+Scene_ct = 0x800C68C8; // type:func
func_800C6960_jp = 0x800C6960; // type:func
func_800C69F4_jp = 0x800C69F4; // type:func
func_800C6A28_jp = 0x800C6A28; // type:func
func_800C6A5C_jp = 0x800C6A5C; // type:func
func_800C6A90_jp = 0x800C6A90; // type:func
-func_800C6AC4_jp = 0x800C6AC4; // type:func
+Door_info_ct = 0x800C6AC4; // type:func
func_800C6AD0_jp = 0x800C6AD0; // type:func
func_800C6AE0_jp = 0x800C6AE0; // type:func
func_800C6B50_jp = 0x800C6B50; // type:func
@@ -3378,7 +3378,7 @@ func_800D2314_jp = 0x800D2314; // type:func
func_800D2334_jp = 0x800D2334; // type:func
func_800D2354_jp = 0x800D2354; // type:func
func_800D2360_jp = 0x800D2360; // type:func
-func_800D236C_jp = 0x800D236C; // type:func
+sAdo_RoomType = 0x800D236C; // type:func
func_800D2394_jp = 0x800D2394; // type:func
func_800D23B4_jp = 0x800D23B4; // type:func
func_800D2438_jp = 0x800D2438; // type:func
@@ -4186,7 +4186,7 @@ D_80100C5C_jp = 0x80100C5C; //
D_80100C60_jp = 0x80100C60; //
D_80100C64_jp = 0x80100C64; //
D_80100C68_jp = 0x80100C68; //
-D_80100C70_jp = 0x80100C70; //
+restore_flag = 0x80100C70; // size:0x20
actor_dlftbls = 0x80100C90; // size:0x1920
actor_dlftbls_num = 0x801025B0; // size:0x4
@@ -4955,7 +4955,7 @@ D_8010DD80_jp = 0x8010DD80; //
D_8010DDAC_jp = 0x8010DDAC; // type:s16
D_8010DDBC_jp = 0x8010DDBC; // type:s16
D_8010DDD0_jp = 0x8010DDD0; //
-D_8010EAA0_jp = 0x8010EAA0; // type:s8
+scene_data_status = 0x8010EAA0; // type:s8
D_8010ED60_jp = 0x8010ED60; //
D_8010EDA0_jp = 0x8010EDA0; //
D_8010EDA4_jp = 0x8010EDA4; //
@@ -5196,7 +5196,7 @@ RO_FLT_80116154_jp = 0x80116154; // type:f32
RO_STR_80116160_jp = 0x80116160; // type:asciz
RO_STR_80116184_jp = 0x80116184; // type:asciz
RO_STR_801161B0_jp = 0x801161B0; // type:asciz
-RO_801161C4_jp = 0x801161C4; //
+RO_STR_801161C4_jp = 0x801161C4; // type:asciz force_migration:True
RO_STR_801161C8_jp = 0x801161C8; // type:asciz
RO_STR_801161DC_jp = 0x801161DC; // type:asciz
RO_801161E8_jp = 0x801161E8; //
@@ -5288,7 +5288,7 @@ RO_FLT_80116444_jp = 0x80116444; // type:f32
RO_FLT_80116448_jp = 0x80116448; // type:f32
RO_FLT_8011644C_jp = 0x8011644C; // type:f32
RO_STR_80116450_jp = 0x80116450; // type:asciz
-RO_80116464_jp = 0x80116464; //
+RO_80116464_jp = 0x80116464; // size:0xC
RO_STR_80116470_jp = 0x80116470; // type:asciz
RO_FLT_80116484_jp = 0x80116484; // type:f32
RO_801164B4_jp = 0x801164B4; //
@@ -6080,7 +6080,7 @@ B_801407C0_jp = 0x801407C0; //
B_80141390_jp = 0x80141390; //
B_80141DE0_jp = 0x80141DE0; //
B_80141DE4_jp = 0x80141DE4; // type:s8
-B_80141DE8_jp = 0x80141DE8; // type:s16
+B_80141DE8_jp = 0x80141DE8; // type:s16 size:0x6
B_80141DF0_jp = 0x80141DF0; //
B_FLT_80141DF4_jp = 0x80141DF4; // type:f32
B_FLT_80141DF8_jp = 0x80141DF8; // type:f32
@@ -6208,9 +6208,7 @@ B_80145860_jp = 0x80145860; //
B_80145880_jp = 0x80145880; //
B_80145898_jp = 0x80145898; //
B_8014589C_jp = 0x8014589C; //
-B_801458A0_jp = 0x801458A0; //
-B_801458B0_jp = 0x801458B0; //
-B_801458B8_jp = 0x801458B8; //
+gSegments = 0x801458A0; // size:0x40
padmgr_class = 0x801458E0; // size:0x480
B_80145D70_jp = 0x80145D70; //
B_80145D80_jp = 0x80145D80; //
diff --git a/linker_scripts/jp/symbol_addrs_overlays.txt b/linker_scripts/jp/symbol_addrs_overlays.txt
index 6287ea3..4596d7f 100644
--- a/linker_scripts/jp/symbol_addrs_overlays.txt
+++ b/linker_scripts/jp/symbol_addrs_overlays.txt
@@ -211,9 +211,9 @@ func_80803F48_jp = 0x80803F48; // type:func
func_8080407C_jp = 0x8080407C; // type:func
func_80804138_jp = 0x80804138; // type:func
func_808041A4_jp = 0x808041A4; // type:func
-func_808041C4_jp = 0x808041C4; // type:func
-func_80804240_jp = 0x80804240; // type:func
-func_80804288_jp = 0x80804288; // type:func
+Gameplay_Scene_Init = 0x808041C4; // type:func
+mPl_SceneNo2SoundRoomType = 0x80804240; // type:func
+Gameplay_Scene_Read = 0x80804288; // type:func
// .data
@@ -8710,7 +8710,7 @@ func_80968F98_jp = 0x80968F98; // type:func
func_80969040_jp = 0x80969040; // type:func
func_80969114_jp = 0x80969114; // type:func
func_809693EC_jp = 0x809693EC; // type:func
-D_80969690_jp = 0x80969690; // type:s16
+D_80969690_jp = 0x80969690; // type:s16 FAKE
func_80969800_jp = 0x80969800; // type:func
func_8096983C_jp = 0x8096983C; // type:func
func_809698E8_jp = 0x809698E8; // type:func
@@ -13630,8 +13630,7 @@ func_80A04AA4_jp = 0x80A04AA4; // type:func
// .data
-_008D2440_Profile = 0x80A04C00; //
-D_80A04C04_jp = 0x80A04C04; //
+_008D2440_Profile = 0x80A04C00; // size:0x24
D_80A04C24_jp = 0x80A04C24; //
D_80A04C38_jp = 0x80A04C38; //
D_80A04C54_jp = 0x80A04C54; //