diff --git a/assets/yaml/us/ast_reward.yaml b/assets/yaml/us/ast_ending_expert.yaml similarity index 79% rename from assets/yaml/us/ast_reward.yaml rename to assets/yaml/us/ast_ending_expert.yaml index b7de27f2..1357e60e 100644 --- a/assets/yaml/us/ast_reward.yaml +++ b/assets/yaml/us/ast_ending_expert.yaml @@ -3,7 +3,7 @@ seg8: 0xD91F10 header: code: - - '#include "assets/ast_reward.h"' + - '#include "assets/ast_ending_expert.h"' header: - '#include "gfx.h"' - '#include "sf64object.h"' diff --git a/include/assets/ast_ending_expert.h b/include/assets/ast_ending_expert.h index a6d4b248..dd36cef8 100644 --- a/include/assets/ast_ending_expert.h +++ b/include/assets/ast_ending_expert.h @@ -5,4 +5,7 @@ #include "sf64object.h" #include "structs.h" +extern u16 gEndingExpertReward[]; +extern u16 gEndingNormalReward[]; + #endif diff --git a/include/sf64dma.h b/include/sf64dma.h index 7dc4278e..9b750179 100644 --- a/include/sf64dma.h +++ b/include/sf64dma.h @@ -173,7 +173,7 @@ DECLARE_SEGMENT(ast_logo); DECLARE_SEGMENT(ast_ending); DECLARE_SEGMENT(ast_ending_award_front); DECLARE_SEGMENT(ast_ending_award_back); -DECLARE_SEGMENT(ast_reward); +DECLARE_SEGMENT(ast_ending_expert); DECLARE_SEGMENT(ast_training); DECLARE_SEGMENT(ast_radio); DECLARE_SEGMENT(ovl_i1); diff --git a/src/main/dmatable.c b/src/main/dmatable.c index f69585ea..18281a63 100644 --- a/src/main/dmatable.c +++ b/src/main/dmatable.c @@ -70,7 +70,9 @@ DmaEntry gDmaTable[90] = { { SEGMENT_ROM_START(ast_ending_award_back), { SEGMENT_ROM_START(ast_ending_award_back), SEGMENT_ROM_END(ast_ending_award_back) }, false }, - { SEGMENT_ROM_START(ast_reward), { SEGMENT_ROM_START(ast_reward), SEGMENT_ROM_END(ast_reward) }, false }, + { SEGMENT_ROM_START(ast_ending_expert), + { SEGMENT_ROM_START(ast_ending_expert), SEGMENT_ROM_END(ast_ending_expert) }, + false }, { SEGMENT_ROM_START(ast_training), { SEGMENT_ROM_START(ast_training), SEGMENT_ROM_END(ast_training) }, false }, { SEGMENT_ROM_START(ast_radio), { SEGMENT_ROM_START(ast_radio), SEGMENT_ROM_END(ast_radio) }, false }, { SEGMENT_ROM_START(ovl_i1), { SEGMENT_ROM_START(ovl_i1), SEGMENT_ROM_END(ovl_i1) }, false }, diff --git a/src/main/fox_load_inits.c b/src/main/fox_load_inits.c index e1999b32..9d6097b6 100644 --- a/src/main/fox_load_inits.c +++ b/src/main/fox_load_inits.c @@ -97,7 +97,7 @@ OverlayInit sOvlending_Ending[6] = { /* 0x5 */ ROM_SEGMENT(ast_font), /* 0x6 */ ROM_SEGMENT(ast_title), /* 0x7 */ ROM_SEGMENT(ast_ending), - /* 0x8 */ ROM_SEGMENT(ast_reward), + /* 0x8 */ ROM_SEGMENT(ast_ending_expert), /* 0x9 */ NO_SEGMENT, /* 0xA */ NO_SEGMENT, /* 0xB */ NO_SEGMENT, @@ -129,7 +129,7 @@ OverlayInit sOvlending_Ending[6] = { /* 0x5 */ ROM_SEGMENT(ast_font), /* 0x6 */ NO_SEGMENT, /* 0x7 */ ROM_SEGMENT(ast_ending), - /* 0x8 */ ROM_SEGMENT(ast_reward), + /* 0x8 */ ROM_SEGMENT(ast_ending_expert), /* 0x9 */ ROM_SEGMENT(ast_font_3d), /* 0xA */ NO_SEGMENT, /* 0xB */ NO_SEGMENT, diff --git a/src/overlays/ovl_ending/fox_end2.c b/src/overlays/ovl_ending/fox_end2.c index 2968c98c..91efbf57 100644 --- a/src/overlays/ovl_ending/fox_end2.c +++ b/src/overlays/ovl_ending/fox_end2.c @@ -1,6 +1,6 @@ #include "global.h" #include "fox_end2_data.c" -#include "assets/ast_reward.h" +#include "assets/ast_ending_expert.h" void func_ending_8018CE20(u32 arg0) { u8 alpha; diff --git a/yamls/us/assets.yaml b/yamls/us/assets.yaml index b5c330e1..670f4285 100644 --- a/yamls/us/assets.yaml +++ b/yamls/us/assets.yaml @@ -261,14 +261,14 @@ subsegments: - [0xD68480, .data, ast_ending_award_back/ast_ending_award_back] - - name: ast_reward + - name: ast_ending_expert exclusive_ram_id: segment_08 type: code dir: assets start: 0xD91F10 vram: 0x08000000 subsegments: - - [0xD91F10, .data, ast_reward/ast_reward] + - [0xD91F10, .data, ast_ending_expert/ast_ending_expert] - name: ast_training exclusive_ram_id: segment_06