kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

core2/code_94A20.c progress

Browse Source
This commit is contained in:
Banjo Kazooie
2022-08-19 13:49:30 -05:00
parent 51f66770d9
commit 07ca1d783d
56 changed files with 219 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/core2/gc/parade.c
View File

@@ -142,11 +142,11 @@ struct{
NodeProp *D_80383100[20];
/* public */
void func_8031B554(void);
void gcparade_beginFinalParade(void);
void gcparade_setState(enum parade_state_e next_state);
/* .code */
void func_8031ABA0(void) {
void gcparade_8031ABA0(void) {
func_8031FBF8();
func_8031FBA0();
if (D_803830F0.unk8 != -1) {
@@ -156,7 +156,7 @@ void func_8031ABA0(void) {
}
}
void func_8031ABF8(void) {
void gcparade_8031ABF8(void) {
D_803830F0.unk8 = func_802C5A30();
func_8030AFD8(1);
mapSavestate_free_all();
@@ -166,13 +166,13 @@ void func_8031ABF8(void) {
func_8031FBA0();
func_803204E4(0x1F, 1);
if (D_803830F0.parade_id == PARADE_1_POST_GRUNTY_BATTLE) {
func_803204E4(0xC1, 1);
func_803204E4(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE, TRUE);
}
func_803228D8();
func_802E4A70();
}
void func_8031AC8C(void) {
void gcparade_8031AC8C(void) {
func_803228D8();
if (map_getLevel(D_803830F0.parade_element->map) != level_get()) {
@@ -198,10 +198,10 @@ void gcparade_setState(enum parade_state_e next_state) {
D_803830F0.count = 0x1B;
func_8025A70C(COMUSIC_8E_CREDITS);
next_state = PARADE_STATE_3_WARP;
func_8031AC8C();
gcparade_8031AC8C();
break;
case PARADE_STATE_2_INIT_FINAL_PARADE: //parade 1 init
func_803204E4(0xC1, 1);
func_803204E4(0xC1, TRUE);
D_803830F0.parade_element = D_8036DAE4;
D_803830F0.indx = 0;
D_803830F0.parade_id = PARADE_1_POST_GRUNTY_BATTLE;
@@ -210,7 +210,7 @@ void gcparade_setState(enum parade_state_e next_state) {
func_8025AB00();
func_8025A70C(COMUSIC_8E_CREDITS);
next_state = PARADE_STATE_3_WARP;
func_8031AC8C();
gcparade_8031AC8C();
break;
case PARADE_STATE_3_WARP:
func_803228D8();
@@ -242,7 +242,7 @@ void gcparade_setState(enum parade_state_e next_state) {
break;
case PARADE_STATE_8_END:
func_803204E4(0x1F, 0);
func_803204E4(0xC1, 0);
func_803204E4(0xC1, FALSE);
func_802E412C(1, 8);
func_802E40C4(0xA);
if (D_803830F0.parade_id == 0) {
@@ -281,10 +281,10 @@ void gcparade_update(void) {
if ((map_get() == MAP_96_CS_END_BEACH_1) && mapSpecificFlags_get(4)) {
mapSpecificFlags_set(4, FALSE);
func_8031B554();
gcparade_beginFinalParade();
return;
}
if (func_803203FC(0x1F) != 0) {
if (func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE) != 0) {
func_8028A8D0();
switch (D_803830F0.state) {
case PARADE_STATE_3_WARP:
@@ -328,12 +328,12 @@ void gcparade_update(void) {
}
}
void func_8031B2F0(void){}
void gcparade_free(void){}
void gcparade_start(void){
func_803204E4(0x20, FALSE);
func_803204E4(UNKFLAGS1_20_BEGIN_CHARACTER_PARADE, FALSE);
func_803204E4(0x1F, TRUE);
if(func_80320454(0xC0, 0))
if(func_80320454(UNKFLAGS1_C0_BEGIN_FINAL_CHARACTER_PARADE, FALSE))
gcparade_setState(PARADE_STATE_2_INIT_FINAL_PARADE);
else
gcparade_setState(PARADE_STATE_1_INIT_FF_PARADE);
@@ -346,11 +346,11 @@ void gcparade_init(void) {
s32 temp_v0;
s32 var_s2;
if (func_803203FC(0x20)) {
if (func_803203FC(UNKFLAGS1_20_BEGIN_CHARACTER_PARADE)) {
gcparade_start();
return;
}
if (func_803203FC(0x1F)) {
if (func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) {
func_80347A14(0);
if ((D_803830F0.state == 3)){
var_s2 = FALSE;
@@ -379,27 +379,27 @@ void gcparade_init(void) {
}
}
int func_8031B4CC(void){
int gcparade_8031B4CC(void){
return ((D_803830F0.parade_element != NULL) && (D_803830F0.parade_element->exit < 0));
}
int func_8031B4F4(void){
int gcparade_8031B4F4(void){
return (D_803830F0.parade_element != NULL) ? D_803830F0.parade_element->unk8 : 0;
}
void func_8031B51C(void){
if (func_803203FC(0x1F)) return;
void gcparade_beginFFParade(void){
if (func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) return;
func_803204E4(0x20, TRUE);
func_803204E4(UNKFLAGS1_20_BEGIN_CHARACTER_PARADE, TRUE);
gcparade_init();
}
void func_8031B554(void){
void gcparade_beginFinalParade(void){
if (func_803203FC(0x1F)) return;
if (func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) return;
func_803204E4(0x20, TRUE);
func_803204E4(0xC0, TRUE);
func_803204E4(UNKFLAGS1_20_BEGIN_CHARACTER_PARADE, TRUE);
func_803204E4(UNKFLAGS1_C0_BEGIN_FINAL_CHARACTER_PARADE, TRUE);
D_803830F0.jiggyscore = jiggyscore_total();
gcparade_init();
}