From a60184c64bd669bd31eeafd391c15ffd4a50741c Mon Sep 17 00:00:00 2001
From: emilybrooks <emilybrooksemilybrooks@gmail.com>
Date: Wed, 14 Feb 2024 11:26:50 -0700
Subject: imported data for ac_train_window (#144)

* initial commit

* add space

* made till_data static
---
 .../actors/ovl_Train_Window/ac_train_window.c      | 28 ++++++++++++++--------
 .../actors/ovl_Train_Window/ac_train_window.h      |  1 -
 2 files changed, 18 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/overlays/actors/ovl_Train_Window/ac_train_window.c b/src/overlays/actors/ovl_Train_Window/ac_train_window.c
index 9b89edf..adacb1c 100644
--- a/src/overlays/actors/ovl_Train_Window/ac_train_window.c
+++ b/src/overlays/actors/ovl_Train_Window/ac_train_window.c
@@ -10,7 +10,18 @@ void Train_Window_Actor_dt(Actor* thisx, Game_Play* game_play);
 void Train_Window_Actor_move(Actor* thisx, Game_Play* game_play);
 void Train_Window_Actor_draw(Actor* thisx, Game_Play* play);
 
-#if 0
+s32 pad922020[] = { 0x00000000, 0x00000000 };
+
+u16 aTrainWindow_tree_pal_table[15][16] = {
+#include "assets/jp/overlays/actors/ovl_Train_Window/aTrainWindow_tree_pal_table.palette.inc.c"
+};
+
+extern EvwAnimeScroll aTrainWindow_out_cloud[1];
+#include "assets/jp/overlays/actors/ovl_Train_Window/aTrainWindow_out_cloud.inc.c"
+
+extern EvwAnimeData aTrainWindow_evw_anime_data[1];
+#include "assets/jp/overlays/actors/ovl_Train_Window/aTrainWindow_evw_anime_data.inc.c"
+
 ActorProfile Train_Window_Profile = {
     /* */ ACTOR_TRAIN_WINDOW,
     /* */ ACTOR_PART_0,
@@ -24,24 +35,21 @@ ActorProfile Train_Window_Profile = {
     /* */ Train_Window_Actor_draw,
     /* */ NULL,
 };
-#endif
-
-// TODO: Import data
 
 extern Gfx rom_train_out_bgsky_model[];
 extern Gfx rom_train_out_bgcloud_modelT[];
 extern Gfx rom_train_out_shineglass_modelT[];
 
-extern u8 till_data[15][2];
-extern u16 aTrainWindow_tree_pal_table[15][16];
-
-extern EvwAnimeData aTrainWindow_evw_anime_data;
-
 s32 aTrainWindow_NoDraw(Actor* thisx, Game* game);
 s32 aTrainWindow_DrawGoneOutTunnel(Actor* thisx, Game* game);
 s32 aTrainWindow_DrawInTunnel(Actor* thisx, Game* game);
 
 s32 aTrainWindow_GetTreePalletIdx(void) {
+    static u8 till_data[15][2] = {
+        { 0x02, 0x03 }, { 0x02, 0x11 }, { 0x02, 0x18 }, { 0x04, 0x03 }, { 0x04, 0x08 },
+        { 0x07, 0x16 }, { 0x09, 0x0F }, { 0x0A, 0x05 }, { 0x0A, 0x17 }, { 0x0B, 0x07 },
+        { 0x0B, 0x0E }, { 0x0B, 0x1C }, { 0x0C, 0x0A }, { 0x0C, 0x11 }, { 0x0C, 0x1F },
+    };
     s32 i;
     lbRTC_month_t month = common_data.time.rtcTime.month;
     lbRTC_day_t day = common_data.time.rtcTime.day;
@@ -307,7 +315,7 @@ void Train_Window_Actor_draw(Actor* thisx, Game_Play* play) {
         aTrainWindow_SetLightPrimColorDetail(&play->state, 127, 255, this->xluAlpha);
         gSPSegment(POLY_XLU_DISP++, 10, this->currentPalette);
         if (1) {}
-        Evw_Anime_Set(&play->state, &aTrainWindow_evw_anime_data);
+        Evw_Anime_Set(&play->state, aTrainWindow_evw_anime_data);
 
         aTrainWindow_SetLightPrimColorDetail(&play->state, 255, 255, this->xluAlpha);
         gSPDisplayList(POLY_OPA_DISP++, rom_train_out_bgsky_model);
diff --git a/src/overlays/actors/ovl_Train_Window/ac_train_window.h b/src/overlays/actors/ovl_Train_Window/ac_train_window.h
index 77af624..f076bdc 100644
--- a/src/overlays/actors/ovl_Train_Window/ac_train_window.h
+++ b/src/overlays/actors/ovl_Train_Window/ac_train_window.h
@@ -26,7 +26,6 @@ typedef struct Train_Window{
     /* 0x1A4 */ f32 xluAlpha;
     /* 0x1A8 */ f32 scrollSpeed;
     /* 0x1AC */ s_xyz pos;
-    /* 0x1B0 */ UNK_TYPE unk_1B0;
 }Train_Window; // size = 0x1B4
 
 #endif
-- 
cgit v1.2.3