Leahnaya/pokestadium
1
0
Fork 0
mirror of https://github.com/pret/pokestadium.git synced 2026-03-21 17:24:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #196 from Kelebek1/fragment64
Some checks are pending
C/C++ CI / build (push) Waiting to run
Details

Browse Source 
fragment64
This commit is contained in:
Maide 2025-04-30 08:36:55 +01:00 committed by GitHub
commit 133f9d24bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 1458 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
include/variables.h
View File

@ -699,6 +699,41 @@ extern u8 D_3015000[];
extern u8 D_3015040[];
extern u8 D_3015080[];
extern u8 D_30150C0[];
extern u8 D_3002220[];
extern u8 D_3002820[];
extern u8 D_3002E20[];
extern u8 D_3003C80[];
extern u8 D_30050C0[];
extern u8 D_3005680[];
extern u8 D_300C660[];
extern u8 D_300D308[];
extern u8 D_300DFB0[];
extern u8 D_300EC58[];
extern u8 D_3005B80[];
extern u8 D_3005F40[];
extern u8 D_3006300[];
extern u8 D_30066C0[];
extern u8 D_3006A80[];
extern u8 D_3006E40[];
extern u8 D_3007200[];
extern u8 D_30075C0[];
extern u8 D_3007980[];
extern u8 D_3007D40[];
extern u8 D_3008100[];
extern u8 D_30084C0[];
extern u8 D_300B9B8[];
extern u8 D_300AD10[];
extern u8 D_3008FD0[];
extern u8 D_3009720[];
extern u8 D_3009E70[];
extern u8 D_300A5C0[];
extern u8 D_3003F80[];
extern u8 D_3004D40[];
extern u8 D_30005B0[];
extern u8 D_3000B60[];
extern u8 D_3001110[];
extern u8 D_30016C0[];
extern u8 D_3001C70[];
extern LEODiskID D_800818E0;

37
linker_scripts/us/symbol_addrs.txt
View File

@ -955,4 +955,39 @@ D_3016900 = 0x3016900;
D_3015000 = 0x3015000;
D_3015040 = 0x3015040;
D_3015080 = 0x3015080;
D_30150C0 = 0x30150C0;
D_30150C0 = 0x30150C0;
D_3002220 = 0x3002220;
D_3002820 = 0x3002820;
D_3002E20 = 0x3002E20;
D_3003C80 = 0x3003C80;
D_30050C0 = 0x30050C0;
D_3005680 = 0x3005680;
D_300C660 = 0x300C660;
D_300D308 = 0x300D308;
D_300DFB0 = 0x300DFB0;
D_300EC58 = 0x300EC58;
D_3005B80 = 0x3005B80;
D_3005F40 = 0x3005F40;
D_3006300 = 0x3006300;
D_30066C0 = 0x30066C0;
D_3006A80 = 0x3006A80;
D_3006E40 = 0x3006E40;
D_3007200 = 0x3007200;
D_30075C0 = 0x30075C0;
D_3007980 = 0x3007980;
D_3007D40 = 0x3007D40;
D_3008100 = 0x3008100;
D_30084C0 = 0x30084C0;
D_300B9B8 = 0x300B9B8;
D_300AD10 = 0x300AD10;
D_3008FD0 = 0x3008FD0;
D_3009720 = 0x3009720;
D_3009E70 = 0x3009E70;
D_300A5C0 = 0x300A5C0;
D_3003F80 = 0x3003F80;
D_3004D40 = 0x3004D40;
D_30005B0 = 0x30005B0;
D_3000B60 = 0x3000B60;
D_3001110 = 0x3001110;
D_30016C0 = 0x30016C0;
D_3001C70 = 0x3001C70;

31
linker_scripts/us/undefined_syms.ld
View File

@ -461,4 +461,33 @@ D_3016900 = 0x3016900;
D_3015000 = 0x3015000;
D_3015040 = 0x3015040;
D_3015080 = 0x3015080;
D_30150C0 = 0x30150C0;
D_30150C0 = 0x30150C0;
D_3009720 = 0x3009720;
D_3009E70 = 0x3009E70;
D_300A5C0 = 0x300A5C0;
D_3003F80 = 0x3003F80;
D_3004D40 = 0x3004D40;
D_30005B0 = 0x30005B0;
D_3000B60 = 0x3000B60;
D_3001110 = 0x3001110;
D_30016C0 = 0x30016C0;
D_3001C70 = 0x3001C70;
D_3006300 = 0x3006300;
D_30066C0 = 0x30066C0;
D_3006A80 = 0x3006A80;
D_3006E40 = 0x3006E40;
D_3007200 = 0x3007200;
D_30075C0 = 0x30075C0;
D_3007980 = 0x3007980;
D_3007D40 = 0x3007D40;
D_3008100 = 0x3008100;
D_30084C0 = 0x30084C0;
D_300B9B8 = 0x300B9B8;
D_300AD10 = 0x300AD10;
D_300C660 = 0x300C660;
D_300D308 = 0x300D308;
D_300DFB0 = 0x300DFB0;
D_300EC58 = 0x300EC58;
D_3005B80 = 0x3005B80;
D_3005F40 = 0x3005F40;
D_3008FD0 = 0x3008FD0;

4
src/1CF30.c
View File

@ -664,6 +664,6 @@ s32 func_8001F5B0(s32 x, s32 y, const char* fmt, ...) {
return var_s2;
}
void func_8001F6E8(s32 arg0, s32 arg1) {
func_8001E78C(&D_800AC870->unk_00[D_800AC870->unk_50], arg1 & 0xFF);
u8 func_8001F6E8(s32 arg0, s32 arg1) {
return func_8001E78C(&D_800AC870->unk_00[D_800AC870->unk_50], arg1 & 0xFF);
}

2
src/1CF30.h
View File

@ -48,6 +48,6 @@ void func_8001F470(void);
void func_8001F4C4(void);
void func_8001F504(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7);
s32 func_8001F5B0(s32 x, s32 y, const char* fmt, ...);
void func_8001F6E8(s32 arg0, s32 arg1);
u8 func_8001F6E8(s32 arg0, s32 arg1);
#endif // _1CF30_H_

4
src/controller.c
View File

@ -111,13 +111,13 @@ void Cont_ReadInputs(void) {
controller->rawStickY = controller->controllerData->stick_y;
controller->buttonPressed =
controller->controllerData->button & (controller->controllerData->button ^ controller->buttonDown);
controller->unkA = controller->buttonDown & (controller->controllerData->button ^ controller->buttonDown);
controller->unk_0A = controller->buttonDown & (controller->controllerData->button ^ controller->buttonDown);
controller->buttonDown = controller->controllerData->button;
Cont_AdjustAnalogStick(controller);
} else {
controller->buttonPressed = 0;
controller->unkA = 0;
controller->unk_0A = 0;
controller->buttonDown = 0;
}
}

4
src/controller.h
View File

@ -25,7 +25,7 @@ typedef struct Controller {
/* 0x04 */ s16 rawStickY;
/* 0x06 */ u16 buttonDown;
/* 0x08 */ u16 buttonPressed;
/* 0x0A */ u16 unkA;
/* 0x0A */ u16 unk_0A;
/* 0x0C */ char fillerC[2];
/* 0x0E */ s16 angle;
/* 0x10 */ f32 stickMag;
@ -33,7 +33,7 @@ typedef struct Controller {
/* 0x18 */ f32 stickY;
/* 0x1C */ OSContStatus *statusData;
/* 0x20 */ OSContPad *controllerData;
} Controller;
} Controller; // size = 0x24
extern Controller gControllers[4];
extern OSMesgQueue gSIEventMesgQueue;

8
src/fragments/14/fragment14_144300.c
View File

@ -127,22 +127,22 @@ void func_86800070(void) {
temp_v0 = *D_86806D68;
D_86807518.buttonDown |= temp_v0->buttonDown;
D_86807518.buttonPressed |= temp_v0->buttonPressed;
D_86807518.unkA |= temp_v0->unkA;
D_86807518.unk_0A |= temp_v0->unk_0A;
temp_v0 = *D_86806D6C;
D_86807518.buttonDown |= temp_v0->buttonDown;
D_86807518.buttonPressed |= temp_v0->buttonPressed;
D_86807518.unkA |= temp_v0->unkA;
D_86807518.unk_0A |= temp_v0->unk_0A;
temp_v0 = *D_86806D70;
D_86807518.buttonDown |= temp_v0->buttonDown;
D_86807518.buttonPressed |= temp_v0->buttonPressed;
D_86807518.unkA |= temp_v0->unkA;
D_86807518.unk_0A |= temp_v0->unk_0A;
temp_v0 = *D_86806D74;
D_86807518.buttonDown |= temp_v0->buttonDown;
D_86807518.buttonPressed |= temp_v0->buttonPressed;
D_86807518.unkA |= temp_v0->unkA;
D_86807518.unk_0A |= temp_v0->unk_0A;
if (1) {}
}

1287
src/fragments/64/fragment64.c
View File

File diff suppressed because it is too large Load Diff

87
src/fragments/64/fragment64.h Normal file
View File

@ -0,0 +1,87 @@
#ifndef _FRAGMENT64_H_
#define _FRAGMENT64_H_
#include "global.h"
#include "src/29BA0.h"
typedef struct unk_D_84803760 {
/* 0x00 */ s8 unk_00;
/* 0x01 */ s8 unk_01;
/* 0x02 */ s8 unk_02[6];
/* 0x08 */ s8 unk_08[6];
/* 0x0E */ s8 unk_0E;
/* 0x0F */ s8 unk_0F;
} unk_D_84803760; // size = 0x10
typedef struct unk_D_848037A0 {
/* 0x0000 */ s8 unk_0000;
/* 0x0001 */ s8 unk_0001;
/* 0x0002 */ s8 unk_0002;
/* 0x0003 */ s8 unk_0003;
/* 0x0004 */ char unk0004[1];
/* 0x0005 */ s8 unk_0005;
/* 0x0006 */ s8 unk_0006;
/* 0x0007 */ s8 unk_0007;
/* 0x0008 */ s8 unk_0008;
/* 0x0009 */ s8 unk_0009;
/* 0x000A */ s8 unk_000A;
/* 0x000B */ s8 unk_000B;
/* 0x000C */ s8 unk_000C[6];
/* 0x0012 */ s16 unk_0012;
/* 0x0014 */ s16 unk_0014;
/* 0x0016 */ s8 unk_0016;
/* 0x0017 */ s8 unk_0017;
/* 0x0018 */ unk_func_80026268_arg0* unk_0018;
/* 0x001C */ unk_D_800AE540_0004* unk_001C;
/* 0x0020 */ u16 unk_0020[1][0x640];
/* 0x0CA0 */ char unk0CA0[0x3E80];
} unk_D_848037A0; // size = 0x4B20
typedef struct unk_D_848035FC {
/* 0x00 */ Color_RGB8 unk_00;
/* 0x04 */ u8* unk_04;
} unk_D_848035FC; // size = 0x8
typedef struct unk_D_84803548 {
/* 0x00 */ u16 unk_00;
/* 0x02 */ u16 unk_02;
} unk_D_84803548; // size = 0x4
void func_84800020(void);
void func_84800184(void);
void func_84800458(unk_D_84803760* arg0, unk_D_800AE540_1194* arg1, s32 arg2);
void func_84800530(s32 arg0, s32 arg1, unk_D_84803760* arg2);
s32 func_8480067C(s32 arg0, s32 arg1, s8 arg2, s8 arg3);
void func_848007B8(void);
void func_848009E8(void);
void func_84800C18(s32 arg0, s32 arg1);
void func_84800C68(s32 arg0);
void func_84800CA4(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4);
void func_84800D08(unk_D_848037A0* arg0);
void func_848012A4(s16 arg0, s16 arg1, s16 arg2);
void func_84801340(unk_D_848037A0* arg0);
void func_848015F8(unk_D_848037A0* arg0);
void func_84801800(unk_D_848037A0* arg0);
void func_84801A88(unk_D_848037A0* arg0);
void func_8480218C(unk_D_848037A0* arg0);
void func_8480225C(unk_D_848037A0* arg0);
void func_84802350(void);
s32 func_84802430(unk_D_848037A0* arg0, s8 arg1);
s32 func_8480247C(unk_D_848037A0* arg0);
s32 func_848025A0(unk_D_848037A0* arg0);
void func_84802614(unk_D_848037A0* arg0, s8 arg1, s32 arg2);
void func_84802740(unk_D_848037A0* arg0);
void func_848027F0(Controller* arg0, unk_D_848037A0* arg1);
void func_8480290C(Controller* arg0, unk_D_848037A0* arg1);
void func_84802A44(Controller* arg0, unk_D_848037A0* arg1);
void func_84802A90(Controller* arg0, unk_D_848037A0* arg1);
s32 func_84802B70(s32 arg0, unk_D_848037A0* arg1);
s32 func_84802C40(s32 arg0);
void func_84802D84(unk_D_800AE540_1194* arg0, unk_D_84803760* arg1);
void func_84802DC8(s8* arg0, s32 arg1);
void func_84802E18(void);
void func_84802F7C(s16 arg0, s16 arg1, unk_D_800AE540_0004* arg2, s32 arg3, s32 arg4);
void func_84803110(unk_D_800AE540* arg0);
s32 func_84803368(s32 arg0, s32 arg1);
#endif // _FRAGMENT64_H_

4
src/stage_loader.c
View File

@ -577,8 +577,8 @@ void func_800079C4(void) {
}
}
void* func_80007A2C(void) {
void* ret = NULL;
unk_func_80007444_018* func_80007A2C(void) {
unk_func_80007444_018* ret = NULL;
if (D_800A7464 != NULL) {
ret = D_800A7464->unk_18[D_800A7464->unk_16];

6
src/stage_loader.h
View File

@ -15,7 +15,9 @@ typedef struct unk_D_800A7450 {
} unk_D_800A7450; // size >= 0x14
typedef struct unk_func_80007444_018 {
/* 0x00 */ char unk00[0x8];
/* 0x00 */ char unk00[0x4];
/* 0x04 */ u16 unk_04;
/* 0x06 */ u16 unk_06;
/* 0x08 */ s32 unk_08;
/* 0x0C */ char unk0C[0x4];
} unk_func_80007444_018; // size = 0x10
@ -67,7 +69,7 @@ s32 func_80007820(u32 arg0, s32 (*arg1)(u8));
s32 func_800078D4(s32 (*arg0)(u8), s32 arg1, s32 arg2);
void func_80007990(u16 arg0);
void func_800079C4(void);
void* func_80007A2C(void);
unk_func_80007444_018* func_80007A2C(void);
s32 func_80007A58(void);
void func_80007A80(void);
void func_80007C3C(void);

6
yamls/us/rom.yaml
View File

@ -2283,10 +2283,10 @@
subsegments:
- [0x3AEE50, textbin, fragments/64/fragment64_header]
- [0x3AEE70, c, fragments/64/fragment64]
- [0x3B2390, data, fragments/64/fragment64_data]
- [0x3B2530, rodata, fragments/64/fragment64_rodata]
- [0x3B2390, .data, fragments/64/fragment64]
- [0x3B2530, .rodata, fragments/64/fragment64]
- {vram: 0x84803760, type: bss, name: fragments/64/fragment64_bss}
- {vram: 0x84803760, type: .bss, name: fragments/64/fragment64}
- name: fragment64_relocs
type: code