Leahnaya/pokestadium
1
0
Fork 0
mirror of https://github.com/pret/pokestadium.git synced 2026-09-30 22:07:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #144 from Kelebek1/fragment12

Browse Source 
fragment12
This commit is contained in:
Revo
2024-09-27 13:06:27 -04:00
committed by GitHub
parent 0404795376 10d561747f
commit 2b15f6cd78
3 changed files with 251 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

242
src/fragments/12/fragment12.c
View File

@@ -1,21 +1,241 @@
#include "global.h"
#include "fragment12.h"
#include "src/12D80.h"
#include "src/17300.h"
#include "src/18140.h"
#include "src/18480.h"
#include "src/19840.h"
#include "src/1C720.h"
#include "src/1CF30.h"
#include "src/20330.h"
#include "src/20470.h"
#include "src/3FB0.h"
#include "src/6A40.h"
#include "src/6BC0.h"
#include "src/F420.h"
#include "src/controller.h"
#include "src/memory.h"
#include "src/stage_loader.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/12/fragment12/func_86600020.s")
static u32 D_86600850[] = {
0x0C00FFFF, 0x05000000, 0x0B00001E, 0x00000000, 0x014000F0, 0x0000000F, 0x00000000, 0x00000000,
0x05000000, 0x0D000000, 0x05000000, 0x0F000002, 0x05000000, 0x1F00FFFF, 0x00000000, 0x00000000,
0x00000000, 0x00640064, 0x00640000, 0x05000000, 0x00000000, 0x8D000020, 0x06000000, 0x06000000,
0x14000000, 0x002B0012, 0xFFFFFF32, 0x16FFFFFF, 0x0F000003, 0x05000000, 0x0A000000, 0x800AC840,
0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x01000000,
};
#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/12/fragment12/func_86600050.s")
static unk_D_86002F30* D_86600940;
static unk_D_86002F34_000* D_86600944;
static unk_D_86002F34_00C* D_86600948;
static unk_D_86002F58_004_000 D_86600950;
static s16 D_86600AB8;
static s16 D_86600ABA;
static s16 D_86600ABC;
#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/12/fragment12/func_866000FC.s")
void func_86600020(void) {
Cont_StartReadInputs();
Cont_ReadInputs();
func_8001F730();
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/12/fragment12/func_86600264.s")
void func_86600050(void) {
D_86600948 = D_86600944->unk_0C;
#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/12/fragment12/func_86600438.s")
D_86600AB8 = 0x100;
D_86600ABA = 0;
D_86600ABC = 0x78;
#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/12/fragment12/func_8660048C.s")
D_86600948->unk_24.near = 10.0f;
D_86600948->unk_24.far = 6400.0f;
#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/12/fragment12/func_866004F8.s")
func_80010354(&D_86600948->unk_60.at, &D_86600948->unk_60.eye, D_86600ABC, D_86600AB8, D_86600ABA);
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/12/fragment12/func_866005B8.s")
void func_866000FC(void) {
if (gPlayer1Controller->buttonDown & 0x800) {
D_86600AB8 += 256;
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/12/fragment12/func_86600658.s")
if (gPlayer1Controller->buttonDown & 0x400) {
D_86600AB8 -= 256;
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/12/fragment12/func_8660070C.s")
if (gPlayer1Controller->buttonDown & 0x200) {
D_86600ABA += 256;
}
if (gPlayer1Controller->buttonDown & 0x100) {
D_86600ABA -= 256;
}
if (gPlayer1Controller->buttonDown & 8) {
D_86600ABC -= 10;
}
if (gPlayer1Controller->buttonDown & 4) {
D_86600ABC += 10;
}
if (D_86600AB8 > 16128) {
D_86600AB8 = 16128;
}
if (D_86600AB8 < 0) {
D_86600AB8 = 0;
}
if (D_86600ABC < 50) {
D_86600ABC = 50;
}
if (D_86600ABC > 2000) {
D_86600ABC = 2000;
}
func_80010354(&D_86600948->unk_60.at, &D_86600948->unk_60.eye, D_86600ABC, D_86600AB8, D_86600ABA);
}
void func_86600264(s32 arg0) {
Color_RGB8 sp2C = { 0, 0, 30 };
Color_RGB8 sp28 = { 0, 0, 250 };
func_8002053C(0xC8, 0xBE, 0x5A, 0x20, &sp2C, &sp28);
func_80020460(0x1E, 0xBE, 0xA0, 0x20, 0x141);
func_8001F3F4();
func_8001F470();
func_8001EBE0(4, -2);
func_8001F324(0xFF, 0xFF, 0xFF, 0xFF);
func_8001F36C(0x50, 0x50, 0xFF, 0xFF);
func_8001F1E8(0x30, 0x14, "MINIGAME7 SAMPLE");
func_8001F4C4();
func_8001EBE0(2, -2);
func_8001F324(0xFF, 0xC8, 0x32, 0xFF);
switch (arg0) {
case 0:
func_8001F1E8(0xCD, 0xC2, "OPENNING");
break;
case 2:
func_8001F1E8(0xCD, 0xC2, "PLAYING");
break;
case 3:
func_8001F1E8(0xCD, 0xC2, "ENDING");
break;
}
if (arg0 == 2) {
func_8001F324(0xFF, 0xFF, 0xFF, 0xFF);
func_8001F1E8(0x23, 0xC2, "CAMERA D:%d", D_86600ABC);
func_8001F1E8(0x23, 0xCE, "X:%04hX Y:%04hX", D_86600AB8, D_86600ABA);
}
func_8001F444();
}
void func_86600438(s32 arg0) {
func_800079C4();
func_8000699C(&gDisplayListHead, 0xA6BF);
func_80015348();
func_80015094(D_86600944);
func_86600264(arg0);
func_80007778();
}
void func_8660048C(void) {
func_80006C6C(0x10);
func_8001BD04(&D_86600950, 8);
if (func_80017514(&D_86600950) == 0) {
do {
func_86600020();
func_86600438(0);
} while (func_80017514(&D_86600950) == 0);
}
}
void func_866004F8(void) {
s32 var_s1 = 1;
s32 var_s0 = 0;
func_8001BD04(&D_86600950, 0);
while (var_s1 != 0) {
func_86600020();
func_866000FC();
var_s0++;
if (gPlayer1Controller->buttonPressed & 0x1000) {
var_s1 = 0;
}
if (var_s0 == 60) {
var_s0 = 0;
func_80017788(&D_86600950);
func_8001BD9C(&D_86600950, 0xA);
}
func_86600438(2);
}
}
void func_866005B8(void) {
s32 i;
func_8001BD04(&D_86600950, 0xB);
func_8001BD9C(&D_86600950, 0xB);
while (func_80017514(&D_86600950) == 0) {
func_86600020();
func_86600438(3);
}
func_80006CB4(30);
for (i = 0; i < 30; i++) {
func_86600020();
func_86600438(3);
}
}
void func_86600658(void) {
MemoryBlock* sp1C = func_80002D10(main_pool_get_available(), 0);
D_86600944 = func_80018B70(sp1C, &D_86600850);
func_80002D60(sp1C);
func_8001BB20();
func_8001BB58(&D_86600950);
func_8001987C();
D_86600940 = func_80019D18(0x19);
func_8001BC34(&D_86600950, 0, 0x19, D_86600940->unk_08->unk_00[0]);
func_8001BD04(&D_86600950, 0);
func_86600050();
}
s32 func_8660070C(UNUSED s32 arg0, UNUSED s32 arg1) {
unk_func_80007444* sp24;
main_pool_push_state('MINI');
func_80005E40(0x10000, 0);
sp24 = func_80007444(0, 1, 3, 1, 2, 1);
func_8001E94C(6, 0);
ASSET_LOAD(D_1000000, common_menu1_ui, 0);
FRAGMENT_LOAD(fragment31);
func_80004454((((u32)D_8D000000 & 0x0FF00000) >> 0x14) - 0x10, _5C7A70_ROM_START, pokedex_area_model_ROM_START);
func_86600658();
func_80007678(sp24);
func_8660048C();
func_866004F8();
func_866005B8();
func_800076C0();
func_8001E9CC();
func_80005EAC();
main_pool_pop_state('MINI');
return 0;
}

17
src/fragments/12/fragment12.h Normal file
View File

@@ -0,0 +1,17 @@
#ifndef _FRAGMENT12_H_
#define _FRAGMENT12_H_
#include "global.h"
void func_86600020(void);
void func_86600050(void);
void func_866000FC(void);
void func_86600264(s32 arg0);
void func_86600438(s32 arg0);
void func_8660048C(void);
void func_866004F8(void);
void func_866005B8(void);
void func_86600658(void);
s32 func_8660070C(UNUSED s32 arg0, UNUSED s32 arg1);
#endif // _FRAGMENT12_H_

6
yamls/us/rom.yaml
View File

@@ -853,10 +853,10 @@
subsegments:
- [0x142B10, textbin, fragments/12/fragment12_header]
- [0x142B30, c, fragments/12/fragment12]
- [0x143360, data, fragments/12/fragment12_data]
- [0x143400, rodata, fragments/12/fragment12_rodata]
- [0x143360, .data, fragments/12/fragment12]
- [0x143400, .rodata, fragments/12/fragment12]
- {vram: 0x86600940, type: bss, name: fragments/12/fragment12_bss}
- {vram: 0x86600940, type: .bss, name: fragments/12/fragment12}
- name: fragment12_relocs
type: code