ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Decompiled three more small functions

Browse Source
This commit is contained in:
Phlosioneer 2019-02-13 00:07:48 -05:00
parent 5beb2baa97
commit 7c405e08d0
2 changed files with 34 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
asm/pokenav.s
View File

@ -5,59 +5,6 @@
.text .text
thumb_func_start sub_81C76FC
sub_81C76FC: @ 81C76FC
push {lr}
movs r0, 0
bl sub_81C763C
ldr r0, [r0, 0xC]
bl sub_81C70D8
pop {r1}
bx r1
thumb_func_end sub_81C76FC
thumb_func_start sub_81C7710
sub_81C7710: @ 81C7710
push {lr}
sub sp, 0x4
movs r0, 0x6F
bl PlaySE
bl sub_81CAADC
movs r1, 0x1
negs r1, r1
movs r0, 0
str r0, [sp]
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
add sp, 0x4
pop {r0}
bx r0
thumb_func_end sub_81C7710
thumb_func_start sub_81C7738
sub_81C7738: @ 81C7738
push {lr}
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
beq _081C7750
movs r0, 0x1
b _081C775E
.pool
_081C7750:
bl sub_81C99D4
bl sub_81C7C94
bl FreeAllWindowBuffers
movs r0, 0
_081C775E:
pop {r1}
bx r1
thumb_func_end sub_81C7738
thumb_func_start sub_81C7764 thumb_func_start sub_81C7764
sub_81C7764: @ 81C7764 sub_81C7764: @ 81C7764
push {r4,lr} push {r4,lr}

38
src/pokenav_main.c
View File

@ -6,6 +6,9 @@
#include "field_weather.h" #include "field_weather.h"
#include "palette.h" #include "palette.h"
#include "pokemon_storage_system.h" #include "pokemon_storage_system.h"
#include "sound.h"
#include "constants/songs.h"
#include "window.h"
#define UNKNOWN_OFFSET 100000 #define UNKNOWN_OFFSET 100000
@ -32,12 +35,12 @@ extern struct UnknownStruct_0861F3EC gUnknown_0861F3EC[7]; // Unknown size; at l
extern void sub_81C7834(u32 (*a0)(void), u32(*a1)(void)); extern void sub_81C7834(u32 (*a0)(void), u32(*a1)(void));
extern void sub_81C7850(u32 a0); extern void sub_81C7850(u32 a0);
extern void sub_81C7710(void);
extern void sub_81C9430(void); extern void sub_81C9430(void);
extern u32 sub_81C7764(u32 a0); extern u32 sub_81C7764(u32 a0);
extern u32 sub_81C76FC(void);
extern u32 sub_81C786C(void); extern u32 sub_81C786C(void);
extern u32 sub_81C7738(void); extern void sub_81CAADC(void);
extern void sub_81C99D4(void);
extern void sub_81C7C94(void);
bool32 sub_81C756C(u32 a0); bool32 sub_81C756C(u32 a0);
@ -45,11 +48,14 @@ bool32 sub_81C76C4(void);
u32 AnyMonHasRibbon(void); u32 AnyMonHasRibbon(void);
u32 sub_81C75E0(void); u32 sub_81C75E0(void);
u32 sub_81C75D4(void); u32 sub_81C75D4(void);
u32 sub_81C76FC(void);
bool32 sub_81C7738(void);
void sub_81C7360(struct UnknownStruct_0203CF40 *a0); void sub_81C7360(struct UnknownStruct_0203CF40 *a0);
void sub_81C7650(u32 index); void sub_81C7650(u32 index);
void sub_81C71E4(u8 a0); void sub_81C71E4(u8 a0);
void sub_81C7170(u8 a0); void sub_81C7170(u8 a0);
void sub_81C742C(u8 taskId); void sub_81C742C(u8 taskId);
void sub_81C7710(void);
void sub_81C75F4(void); void sub_81C75F4(void);
void sub_81C7334(void); void sub_81C7334(void);
void sub_81C7418(void); void sub_81C7418(void);
@ -71,7 +77,7 @@ u32 sub_81C7078(u32 (*a0)(u32), u32 a1)
return ((gUnknown_0203CF3C++) << 16) | taskId; return ((gUnknown_0203CF3C++) << 16) | taskId;
} }
bool32 sub_81C70D8(u32 a0, u32 unused) bool32 sub_81C70D8(u32 a0)
{ {
u32 v1 = a0 & 0xFFFF; u32 v1 = a0 & 0xFFFF;
u32 v2 = a0 >> 16; u32 v2 = a0 >> 16;
@ -426,3 +432,27 @@ bool32 sub_81C76C4(void) {
return TRUE; return TRUE;
} }
} }
u32 sub_81C76FC(void) {
// This is a guess.
struct UnknownStruct_sub_81C76C4 *v1;
v1 = sub_81C763C(0);
return sub_81C70D8(v1->data[3]);
}
void sub_81C7710(void) {
PlaySE(SE_PN_OFF);
sub_81CAADC();
BeginNormalPaletteFade(-1, -1, 0, 16, 0);
}
bool32 sub_81C7738(void) {
if (!gPaletteFade.active) {
sub_81C99D4();
sub_81C7C94();
FreeAllWindowBuffers();
return FALSE;
} else {
return TRUE;
}
}