From c97b9ad6f32fe3e6f1d87bccfe64336dc97ff424 Mon Sep 17 00:00:00 2001
From: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
Date: Thu, 22 Feb 2024 00:32:47 -0300
Subject: [PATCH] ast_reward

---
 assets/yaml/us/ast_reward.yaml     | 16 ++++++++++++++++
 src/overlays/ovl_ending/fox_end2.c |  5 +++--
 yamls/us/assets.yaml               |  6 +++++-
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 assets/yaml/us/ast_reward.yaml

diff --git a/assets/yaml/us/ast_reward.yaml b/assets/yaml/us/ast_reward.yaml
new file mode 100644
index 00000000..b7de27f2
--- /dev/null
+++ b/assets/yaml/us/ast_reward.yaml
@@ -0,0 +1,16 @@
+:config:
+  segments:
+    seg8: 0xD91F10
+  header:
+    code:
+      - '#include "assets/ast_reward.h"'
+    header:
+      - '#include "gfx.h"'
+      - '#include "sf64object.h"'
+      - '#include "structs.h"'
+
+ending_expert_reward:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 316, height: 240, offset: 0x8000000, symbol: gEndingExpertReward }
+
+ending_normal_reward:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 316, height: 240, offset: 0x8025080, symbol: gEndingNormalReward }
\ No newline at end of file
diff --git a/src/overlays/ovl_ending/fox_end2.c b/src/overlays/ovl_ending/fox_end2.c
index c2ec16d3..2968c98c 100644
--- a/src/overlays/ovl_ending/fox_end2.c
+++ b/src/overlays/ovl_ending/fox_end2.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "fox_end2_data.c"
+#include "assets/ast_reward.h"
 
 void func_ending_8018CE20(u32 arg0) {
     u8 alpha;
@@ -146,9 +147,9 @@ void func_ending_8018D638(u32 arg0, AssetInfo* asset) {
     if (gExpertMode != 0) {
         for (i = 0; i < 240; i += 4) {
             if (!D_800D2F68) {
-                TextureRect_16bRGBA(&gMasterDisp, D_8025080 + 316 * i, 316, 4, 0.0f, i, 1.0f, 1.0f);
+                TextureRect_16bRGBA(&gMasterDisp, gEndingNormalReward + 316 * i, 316, 4, 0.0f, i, 1.0f, 1.0f);
             } else {
-                TextureRect_16bRGBA(&gMasterDisp, D_8000000_RGBA + 316 * i, 316, 4, 0.0f, i, 1.0f, 1.0f);
+                TextureRect_16bRGBA(&gMasterDisp, gEndingExpertReward + 316 * i, 316, 4, 0.0f, i, 1.0f, 1.0f);
             }
         }
     } else {
diff --git a/yamls/us/assets.yaml b/yamls/us/assets.yaml
index dd6e7cc4..b5c330e1 100644
--- a/yamls/us/assets.yaml
+++ b/yamls/us/assets.yaml
@@ -263,8 +263,12 @@
 
   - name: ast_reward
     exclusive_ram_id: segment_08
-    type: bin
+    type: code
+    dir: assets
     start: 0xD91F10
+    vram: 0x08000000
+    subsegments:
+      - [0xD91F10, .data, ast_reward/ast_reward]
 
   - name: ast_training
     exclusive_ram_id: segment_06