mirror of
https://github.com/pret/pmd-sky.git
synced 2026-11-19 05:26:00 -06:00
Decomp ov34_022DC5B0 thanks to @CecilArmitais
This commit is contained in:
110
asm/overlay_34.s
110
asm/overlay_34.s
@@ -17,6 +17,7 @@
|
||||
.public ov34_022DC778
|
||||
.public ov34_022DC748
|
||||
.public ov34_022DC738
|
||||
.public ov34_022DC5B0
|
||||
|
||||
arm_func_start ExplorersOfSkyMain
|
||||
ExplorersOfSkyMain: ; 0x022DC240
|
||||
@@ -296,112 +297,3 @@ _022DC5AC: .word ov34_022DD004
|
||||
#endif
|
||||
arm_func_end ExplorersOfSkyMain
|
||||
|
||||
arm_func_start ov34_022DC5B0
|
||||
ov34_022DC5B0: ; 0x022DC5B0
|
||||
stmdb sp!, {r4, lr}
|
||||
bl sub_0201BF64
|
||||
bl sub_02028E40
|
||||
bl sub_020038D8
|
||||
cmp r0, #0
|
||||
beq _022DC5D0
|
||||
bl ov34_022DC9CC
|
||||
bl sub_02003990
|
||||
_022DC5D0:
|
||||
bl ov34_022DCA70
|
||||
bl sub_0201DD48
|
||||
bl sub_0201F464
|
||||
ldr r0, _022DC710 ; =OVERLAY34_UNKNOWN_POINTER__NA_22DD080
|
||||
ldrb r0, [r0]
|
||||
cmp r0, #0
|
||||
bne _022DC5F0
|
||||
bl sub_0201DDFC
|
||||
_022DC5F0:
|
||||
bl sub_02008F84
|
||||
bl sub_0201BE28
|
||||
bl sub_02017A80
|
||||
bl sub_02003A40
|
||||
ldr r1, _022DC710 ; =OVERLAY34_UNKNOWN_POINTER__NA_22DD080
|
||||
mov r4, r0
|
||||
ldrb r0, [r1]
|
||||
cmp r0, #0
|
||||
ldrne r0, _022DC714 ; =ov34_022DD0A0
|
||||
ldrne r0, [r0, #8]
|
||||
cmpne r0, #1
|
||||
beq _022DC6C4
|
||||
cmp r0, #2
|
||||
bne _022DC64C
|
||||
mov r0, #0
|
||||
mov r1, #0x100
|
||||
bl sub_02008F3C
|
||||
mov r0, #1
|
||||
mov r1, #0x100
|
||||
bl sub_02008F3C
|
||||
mov r0, #0
|
||||
bl sub_02008ED0
|
||||
b _022DC6C4
|
||||
_022DC64C:
|
||||
cmp r0, #3
|
||||
mov r0, #0
|
||||
bne _022DC678
|
||||
#ifdef NORTH_AMERICA
|
||||
mov r1, r0
|
||||
#else
|
||||
mov r1, #0x100
|
||||
#endif
|
||||
bl sub_02008F3C
|
||||
mov r0, #1
|
||||
mov r1, #0
|
||||
bl sub_02008F3C
|
||||
mov r0, #0
|
||||
bl sub_02008ED0
|
||||
b _022DC6C4
|
||||
_022DC678:
|
||||
#ifdef NORTH_AMERICA
|
||||
sub r1, r0, #0x100
|
||||
#else
|
||||
mov r1, r0
|
||||
#endif
|
||||
bl sub_02008F3C
|
||||
mov r0, #1
|
||||
mvn r1, #0xff
|
||||
bl sub_02008F3C
|
||||
mov r0, #0
|
||||
bl sub_02008ED0
|
||||
mov r0, #0
|
||||
mov r1, #2
|
||||
bl sub_02008F64
|
||||
mov r0, #0
|
||||
mov r1, #3
|
||||
bl sub_02008F64
|
||||
mov r0, #1
|
||||
mov r1, #2
|
||||
bl sub_02008F64
|
||||
mov r0, #1
|
||||
mov r1, #3
|
||||
bl sub_02008F64
|
||||
_022DC6C4:
|
||||
bl sub_02008F88
|
||||
mov r0, r4
|
||||
bl sub_02028A64
|
||||
bl GroupOamAttributesBothScreens
|
||||
bl sub_0201BE84
|
||||
bl G3X_Reset
|
||||
bl sub_0201DE10
|
||||
bl sub_02028E88
|
||||
ldr r0, _022DC714 ; =ov34_022DD0A0
|
||||
ldr r0, [r0, #8]
|
||||
cmp r0, #3
|
||||
beq _022DC6F8
|
||||
bl sub_02051C24
|
||||
_022DC6F8:
|
||||
bl sub_0201BF4C
|
||||
ldr r1, _022DC710 ; =OVERLAY34_UNKNOWN_POINTER__NA_22DD080
|
||||
mov r2, #0
|
||||
mov r0, r4
|
||||
strb r2, [r1]
|
||||
ldmia sp!, {r4, pc}
|
||||
.align 2, 0
|
||||
_022DC710: .word OVERLAY34_UNKNOWN_POINTER__NA_22DD080
|
||||
_022DC714: .word ov34_022DD0A0
|
||||
arm_func_end ov34_022DC5B0
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#include "util.h"
|
||||
|
||||
u32 ov34_022DC5B0(void);
|
||||
bool8 ov34_022DC718(s32 arg0);
|
||||
bool8 ov34_022DC738(void);
|
||||
void ov34_022DC748(void);
|
||||
|
||||
@@ -4,10 +4,12 @@
|
||||
#include "main_020027E8.h"
|
||||
#include "main_0200BC54.h"
|
||||
#include "main_0200BD2C.h"
|
||||
#include "main_0201BCCC.h"
|
||||
#include "main_0202A66C.h"
|
||||
#include "main_0202AAA8.h"
|
||||
#include "main_0202AB40.h"
|
||||
#include "main_0202F180.h"
|
||||
#include "nitro.h"
|
||||
|
||||
// TODO: types aren't final.. this is just prelimary moving them to src/rodata from asm
|
||||
const u8 ov34_022DCFF4[] = {0x42, 0x41, 0x43, 0x4B, 0x2F, 0x6E, 0x5F, 0x6C, 0x6F, 0x67, 0x6F, 0x2E, 0x62, 0x67, 0x70, 0x00};
|
||||
@@ -41,6 +43,16 @@ extern s8 CreateDialogueBox(s8);
|
||||
extern void CloseDialogueBox(s8);
|
||||
s32 InitMenu(u32*);
|
||||
|
||||
|
||||
struct Overlay_34_022DD0A0 {
|
||||
s32 unk0;
|
||||
u32 unk4;
|
||||
u32 unk8;
|
||||
u32 unkC;
|
||||
};
|
||||
|
||||
extern struct Overlay_34_022DD0A0 ov34_022DD0A0;
|
||||
|
||||
typedef struct {
|
||||
u8 field_0;
|
||||
u8 field_01;
|
||||
@@ -55,11 +67,7 @@ extern UNK_ov34_022DD0B0 ov34_022DD0B0;
|
||||
extern struct screen_fade ov34_022DD104;
|
||||
extern struct screen_fade ov34_022DD0C0;
|
||||
|
||||
struct Overlay_34_022DD0A0 {
|
||||
s32 unk0;
|
||||
};
|
||||
|
||||
extern struct Overlay_34_022DD0A0 ov34_022DD0A0;
|
||||
extern u8 OVERLAY34_UNKNOWN_POINTER__NA_22DD080;
|
||||
|
||||
extern void sub_0200BB74(struct screen_fade *, s32, s32);
|
||||
extern void sub_0200BB60(struct screen_fade *, s32);
|
||||
@@ -68,6 +76,95 @@ extern void sub_0200B894(struct screen_fade*, s32);
|
||||
extern void sub_0200B8D4(struct screen_fade*, s32);
|
||||
extern void sub_0200B8B8(struct screen_fade*);
|
||||
|
||||
extern void sub_02028E40(void);
|
||||
extern u32 sub_020038D8(void);
|
||||
extern void sub_02003990(void);
|
||||
extern void sub_0201DD48(void);
|
||||
extern void sub_0201F464(void);
|
||||
extern void sub_02008F84(void);
|
||||
extern void sub_02017A80(void);
|
||||
extern u32 sub_02003A40(void);
|
||||
extern void sub_0201DDFC(void);
|
||||
extern void sub_02008ED0(u32);
|
||||
extern void sub_02008F64(u32, u32);
|
||||
extern void sub_02008F88(void);
|
||||
extern void sub_0201DE10(void);
|
||||
extern void sub_02028E88(void);
|
||||
extern void sub_02051C24(void);
|
||||
extern void sub_02028A64(u32);
|
||||
|
||||
u32 ov34_022DC5B0(void)
|
||||
{
|
||||
sub_0201BF64();
|
||||
sub_02028E40();
|
||||
|
||||
if (sub_020038D8()) { //Sys_IsMailboxPending
|
||||
ov34_022DC9CC();
|
||||
sub_02003990(); //Task_AbortSync
|
||||
}
|
||||
|
||||
ov34_022DCA70();
|
||||
sub_0201DD48();
|
||||
sub_0201F464();
|
||||
|
||||
if (OVERLAY34_UNKNOWN_POINTER__NA_22DD080 == 0) {
|
||||
sub_0201DDFC();
|
||||
}
|
||||
|
||||
sub_02008F84();
|
||||
sub_0201BE28();
|
||||
sub_02017A80();
|
||||
|
||||
u32 ret_val = sub_02003A40(); //Sys_WaitForVBlank
|
||||
|
||||
if (OVERLAY34_UNKNOWN_POINTER__NA_22DD080 != 0 && ov34_022DD0A0.unk8 != 1) {
|
||||
|
||||
if (ov34_022DD0A0.unk8 == 2) {
|
||||
sub_02008F3C(0, 0x100);
|
||||
sub_02008F3C(1, 0x100);
|
||||
sub_02008ED0(0); //GraphicsEngine_SetState
|
||||
} else if (ov34_022DD0A0.unk8 == 3) {
|
||||
#ifdef NORTH_AMERICA
|
||||
sub_02008F3C(0, 0);
|
||||
#else
|
||||
sub_02008F3C(0, 0x100);
|
||||
#endif
|
||||
sub_02008F3C(1, 0);
|
||||
sub_02008ED0(0); //GraphicsEngine_SetState
|
||||
} else {
|
||||
#ifdef NORTH_AMERICA
|
||||
sub_02008F3C(0, -0x100);
|
||||
#else
|
||||
sub_02008F3C(0, 0);
|
||||
#endif
|
||||
sub_02008F3C(1, -0x100);
|
||||
sub_02008ED0(0); //GraphicsEngine_SetState
|
||||
sub_02008F64(0, 2);
|
||||
sub_02008F64(0, 3);
|
||||
sub_02008F64(1, 2);
|
||||
sub_02008F64(1, 3);
|
||||
}
|
||||
}
|
||||
|
||||
sub_02008F88(); //GraphicsEngine_ApplyState
|
||||
sub_02028A64(ret_val);
|
||||
GroupOamAttributesBothScreens();
|
||||
sub_0201BE84();
|
||||
G3X_Reset();
|
||||
sub_0201DE10();
|
||||
sub_02028E88();
|
||||
|
||||
if (ov34_022DD0A0.unk8 != 3) {
|
||||
sub_02051C24();
|
||||
}
|
||||
|
||||
sub_0201BF4C();
|
||||
|
||||
OVERLAY34_UNKNOWN_POINTER__NA_22DD080 = 0;
|
||||
|
||||
return ret_val;
|
||||
}
|
||||
|
||||
bool8 ov34_022DC718(s32 arg0)
|
||||
{
|
||||
if (ov34_022DD0A0.unk0 == 0) {
|
||||
|
||||
Reference in New Issue
Block a user