Leahnaya/pokestadium
1
0
Fork 0
mirror of https://github.com/pret/pokestadium.git synced 2026-04-25 07:57:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #223 from dplewis/stage-loader-match

Browse Source 
Match stage_loader.c
This commit is contained in:
Revo 2026-01-09 10:46:58 -05:00 committed by GitHub
commit b98d1f7aec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/stage_loader.c
View File

@ -180,12 +180,12 @@ s32 func_80007A58(void);
void func_80007FC4(Gfx**, s32);
void func_800080E0(void);
#ifdef NON_MATCHING
void func_800069F0(void) {
u8 a;
u8 b;
u8 g;
u8 r;
unk_func_80007444* v0 = D_800A7464;
if (D_800A7464->unk_11 == 0) {
return;
@ -195,25 +195,21 @@ void func_800069F0(void) {
g = RGBA16_GET_G(D_800A7464->unk_14);
b = RGBA16_GET_B(D_800A7464->unk_14);
r = ((r << 3) | (r >> 2)) & 0xFF;
g = ((g << 3) | (g >> 2)) & 0xFF;
b = ((b << 3) | (b >> 2)) & 0xFF;
r = (r << 3) | (r >> 2);
g = (g << 3) | (g >> 2);
b = (b << 3) | (b >> 2);
switch (D_800A7464->unk_11) {
default:
a = a;
break;
case 1:
a = 0xFF;
a = 255;
break;
case 2:
a = (0xFF - ((D_800A7464->unk_13 * 0xFF) / D_800A7464->unk_12));
a = (255 - ((D_800A7464->unk_13 * 255) / D_800A7464->unk_12));
break;
case 3:
a = ((D_800A7464->unk_13 * 0xFF) / D_800A7464->unk_12);
a = ((D_800A7464->unk_13 * 255) / D_800A7464->unk_12);
break;
}
@ -235,10 +231,6 @@ void func_800069F0(void) {
}
}
}
#else
void func_800069F0(void);
#pragma GLOBAL_ASM("asm/us/nonmatchings/stage_loader/func_800069F0.s")
#endif
s32 func_80006C04(s32 arg0) {
s32 ret = 0;

1
src/stage_loader.h
View File

@ -32,6 +32,7 @@ typedef struct unk_func_80007444 {
/* 0x13 */ u8 unk_13;
/* 0x14 */ u16 unk_14;
/* 0x16 */ s8 unk_16;
/* 0x17 */ u8 pad17;
/* 0x18 */ unk_D_80068BB0* unk_18[3];
} unk_func_80007444; // size = 0x24

2
yamls/us/rom.yaml
View File

@ -500,7 +500,7 @@
- {vram: 0x800A6D20, type: .bss, name: reset}
- {vram: 0x800A7320, type: .bss, name: controller}
- {vram: 0x800A7420, type: bss, name: unk_bss_3}
- {vram: 0x800A7450, type: .bss, name: stage_loader}
- {vram: 0x800A7450, type: .bss, name: stage_loader}
- {vram: 0x800A74C0, type: .bss, name: crash_screen}
- {vram: 0x800A7EA0, type: .bss, name: profiler}
- {vram: 0x800A8100, type: bss, name: unk_bss_2}