From 35eba20abdd3f810a2f878edea37890858ffccc2 Mon Sep 17 00:00:00 2001
From: Prakxo <87568477+Prakxo@users.noreply.github.com>
Date: Tue, 24 Sep 2024 21:05:32 +0200
Subject: ef_room_sunshine OK (#214)

* ef_room_sunshine OK

* format

* jenkins

* fourth time's the charm
---
 linker_scripts/jp/symbol_addrs_code.txt     |  2 +-
 linker_scripts/jp/symbol_addrs_overlays.txt | 10 +++++-----
 linker_scripts/jp/undefined_syms.ld         | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'linker_scripts')

diff --git a/linker_scripts/jp/symbol_addrs_code.txt b/linker_scripts/jp/symbol_addrs_code.txt
index bd3b389..4841f94 100644
--- a/linker_scripts/jp/symbol_addrs_code.txt
+++ b/linker_scripts/jp/symbol_addrs_code.txt
@@ -768,7 +768,7 @@ func_80071604_jp = 0x80071604; // type:func
 func_80071728_jp = 0x80071728; // type:func
 func_8007175C_jp = 0x8007175C; // type:func
 mCoBG_GetBgY_AngleS_FromWpos = 0x80071884; // type:func
-func_80071A08_jp = 0x80071A08; // type:func
+mCoBG_GetBgY_OnlyCenter_FromWpos = 0x80071A08; // type:func
 func_80071AB8_jp = 0x80071AB8; // type:func
 mCoBG_GetBgY_OnlyCenter_FromWpos2 = 0x80071B78; // type:func
 mCoBG_GetBgNorm_FromWpos = 0x80071C1C; // type:func
diff --git a/linker_scripts/jp/symbol_addrs_overlays.txt b/linker_scripts/jp/symbol_addrs_overlays.txt
index 310fbe2..d7b0779 100644
--- a/linker_scripts/jp/symbol_addrs_overlays.txt
+++ b/linker_scripts/jp/symbol_addrs_overlays.txt
@@ -8521,12 +8521,12 @@ B_80965C20_jp = 0x80965C20; //
 // .text
 
 Ef_Room_Sunshine_actor_ct = 0x80965C90; // type:func
-func_80965E38_jp = 0x80965E38; // type:func
-func_80965EE0_jp = 0x80965EE0; // type:func
-func_80965FF0_jp = 0x80965FF0; // type:func
+calc_scale_Ef_Room_Sunshine = 0x80965E38; // type:func
+calc_alpha_Ef_Room_Sunshine = 0x80965EE0; // type:func
+Ef_Room_SunshineL_actor_move = 0x80965FF0; // type:func
 Ef_Room_SunshineR_actor_move = 0x80966088; // type:func
-func_80966120_jp = 0x80966120; // type:func
-func_8096628C_jp = 0x8096628C; // type:func
+setup_mode_Ef_Room_Sunshine = 0x80966120; // type:func
+Ef_Room_SunshineL_actor_draw = 0x8096628C; // type:func
 Ef_Room_SunshineR_actor_draw = 0x80966370; // type:func
 
 // .data
diff --git a/linker_scripts/jp/undefined_syms.ld b/linker_scripts/jp/undefined_syms.ld
index d18f37b..e733637 100644
--- a/linker_scripts/jp/undefined_syms.ld
+++ b/linker_scripts/jp/undefined_syms.ld
@@ -1129,12 +1129,12 @@ D_600D878 = 0x0600D878;
 
 // ovl_Room_Sunshine
 
-D_6000140 = 0x06000140;
-D_6000160 = 0x06000160;
-D_6000180 = 0x06000180;
-D_60001A0 = 0x060001A0;
-D_6000208 = 0x06000208;
-D_6000220 = 0x06000220;
+light_shine01_mode = 0x06000140;
+light_shineL01_vtx = 0x06000160;
+light_shineR01_vtx = 0x06000180;
+light_floor01_mode = 0x060001A0;
+light_floorL01_vtx = 0x06000208;
+light_floorR01_vtx = 0x06000220;
 
 // ovl_Room_Sunshine_Posthouse
 
-- 
cgit v1.2.3