ast_reward

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 }

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 {

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