Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-08-20 00:15:40 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Incorrect Names in Rowan Intro (#632)

Browse Source
This commit is contained in:
James Petersen
2025-07-15 19:51:39 -03:00
committed by GitHub
parent 99483b3c58
commit fd3f2eef6c
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platinum.us/main.lsf
View File

@@ -1263,7 +1263,7 @@ Overlay rowan_intro
{
After main
Object main.nef.p/src_applications_rowan_intro_rowan_intro_app.c.o
Object main.nef.p/src_applications_rowan_intro_keyboard_app.c.o
Object main.nef.p/src_applications_rowan_intro_tv_app.c.o
}
Overlay options_menu

17
src/applications/rowan_intro/rowan_intro_app.c
View File

@@ -292,10 +292,9 @@ static void RowanIntro_LoadTilemap(RowanIntro *manager);
static void RowanIntro_LoadSubLayer3Tilemap(RowanIntro *manager);
static BOOL RowanIntro_Run(RowanIntro *manager);
// Keyboard application Init,Main,Exit
int ov73_021D3250(ApplicationManager *appMan, int *state);
int ov73_021D3280(ApplicationManager *appMan, int *state);
int ov73_021D3404(ApplicationManager *appMan, int *state);
int RowanIntroTv_Init(ApplicationManager *appMan, int *state);
int RowanIntroTv_Main(ApplicationManager *appMan, int *state);
int RowanIntroTv_Exit(ApplicationManager *appMan, int *state);
const ApplicationManagerTemplate sDummyApplicationManagerTemplate = {
RowanIntro_Init,
@@ -304,10 +303,10 @@ const ApplicationManagerTemplate sDummyApplicationManagerTemplate = {
FS_OVERLAY_ID_NONE,
};
static const ApplicationManagerTemplate sKeyboardApplicationTemplate = {
ov73_021D3250,
ov73_021D3280,
ov73_021D3404,
static const ApplicationManagerTemplate sTvApplicationTemplate = {
RowanIntroTv_Init,
RowanIntroTv_Main,
RowanIntroTv_Exit,
FS_OVERLAY_ID_NONE,
};
@@ -2991,7 +2990,7 @@ static BOOL RowanIntro_Run(RowanIntro *manager)
break;
case RI_STATE_END:
manager->appMan = ApplicationManager_New(
&sKeyboardApplicationTemplate,
&sTvApplicationTemplate,
NULL,
manager->heapID);
manager->state = RI_STATE_EXIT;

12
src/applications/rowan_intro/keyboard_app.c → src/applications/rowan_intro/tv_app.c
View File

@@ -29,9 +29,9 @@ typedef struct {
} UnkStruct_ov73_021D342C;
void EnqueueApplication(FSOverlayID param0, const ApplicationManagerTemplate *param1);
int ov73_021D3250(ApplicationManager *appMan, int *param1);
int ov73_021D3280(ApplicationManager *appMan, int *param1);
int ov73_021D3404(ApplicationManager *appMan, int *param1);
int RowanIntroTv_Init(ApplicationManager *appMan, int *param1);
int RowanIntroTv_Main(ApplicationManager *appMan, int *param1);
int RowanIntroTv_Exit(ApplicationManager *appMan, int *param1);
static void ov73_021D3420(void *param0);
static void ov73_021D342C(UnkStruct_ov73_021D342C *param0);
static void ov73_021D35F4(UnkStruct_ov73_021D342C *param0);
@@ -40,7 +40,7 @@ static void ov73_021D368C(UnkStruct_ov73_021D342C *param0);
static BOOL ov73_021D3698(UnkStruct_ov73_021D342C *param0, int param1, int param2, int param3);
static void ov73_021D37AC(UnkStruct_ov73_021D342C *param0);
int ov73_021D3250(ApplicationManager *appMan, int *param1)
int RowanIntroTv_Init(ApplicationManager *appMan, int *param1)
{
UnkStruct_ov73_021D342C *v0;
int heapID = HEAP_ID_83;
@@ -56,7 +56,7 @@ int ov73_021D3250(ApplicationManager *appMan, int *param1)
return 1;
}
int ov73_021D3280(ApplicationManager *appMan, int *param1)
int RowanIntroTv_Main(ApplicationManager *appMan, int *param1)
{
UnkStruct_ov73_021D342C *v0 = ApplicationManager_Data(appMan);
int v1 = 0;
@@ -142,7 +142,7 @@ int ov73_021D3280(ApplicationManager *appMan, int *param1)
return v1;
}
int ov73_021D3404(ApplicationManager *appMan, int *param1)
int RowanIntroTv_Exit(ApplicationManager *appMan, int *param1)
{
UnkStruct_ov73_021D342C *v0 = ApplicationManager_Data(appMan);
int heapID = v0->heapID;

2
src/meson.build
View File

@@ -803,7 +803,7 @@ pokeplatinum_c = files(
'overlay071/ov71_0223D324.c',
'overlay072/ov72_0223D7A0.c',
'applications/rowan_intro/rowan_intro_app.c',
'applications/rowan_intro/keyboard_app.c',
'applications/rowan_intro/tv_app.c',
'applications/options_menu.c',
'overlay075/ov75_021D0D80.c',
'overlay076/ov76_0223B140.c',