Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-08-26 02:34:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

borrow names from pokeplatinum

Browse Source
This commit is contained in:
Lincoln-LM
2024-09-03 09:55:18 -06:00
parent d68dd9a741
commit 6df7f6ca7f
28 changed files with 147 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arm9/global.inc
View File

@@ -7960,9 +7960,9 @@
.extern ov20_022529A0
.extern ov20_022529B4
.extern ov20_02252B1C
.extern ov20_02252B28
.extern Poketch_PlaySoundEffect
.extern ov20_02252B48
.extern ov20_02252B68
.extern TouchScreen_GetTapState
.extern ov20_02252BB8
.extern ov20_02252C08
.extern ov20_02252C14

8
arm9/overlays/19/src/overlay_19.c
View File

@@ -28,9 +28,9 @@ void ov19_02252440(struct BgConfig * bgConfig)
GX_SetBankForSubOBJ(0x100);
GXS_SetOBJVRamModeChar(GX_OBJVRAMMODE_CHAR_1D_32K);
InitBgFromTemplate(bgConfig, GF_BG_LYR_SUB_0, &ov19_02252508, GF_BG_TYPE_TEXT);
GfGfxLoader_LoadCharData(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0010_NCGR_lz, bgConfig, GF_BG_LYR_SUB_0, 0, 0, TRUE, HEAP_ID_8);
GfGfxLoader_LoadScrnData(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0011_NSCR_lz, bgConfig, GF_BG_LYR_SUB_0, 0, 0, TRUE, HEAP_ID_8);
GfGfxLoader_GXLoadPal(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0012_NCLR, GF_PAL_LOCATION_SUB_BG, GF_PAL_SLOT_0_OFFSET, 0x20, HEAP_ID_8);
GfGfxLoader_LoadCharData(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0010_NCGR_lz, bgConfig, GF_BG_LYR_SUB_0, 0, 0, TRUE, HEAP_ID_POKETCH_APP);
GfGfxLoader_LoadScrnData(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0011_NSCR_lz, bgConfig, GF_BG_LYR_SUB_0, 0, 0, TRUE, HEAP_ID_POKETCH_APP);
GfGfxLoader_GXLoadPal(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0012_NCLR, GF_PAL_LOCATION_SUB_BG, GF_PAL_SLOT_0_OFFSET, 0x20, HEAP_ID_POKETCH_APP);
GXS_SetVisibleWnd(GX_WNDMASK_NONE);
GXS_SetVisiblePlane(GX_PLANEMASK_BG0);
}
@@ -38,7 +38,7 @@ void ov19_02252440(struct BgConfig * bgConfig)
void ov19_022524F4(struct BgConfig * bgConfig)
{
FreeBgTilemapBuffer(bgConfig, GF_BG_LYR_SUB_0);
DestroyHeap(HEAP_ID_8);
DestroyHeap(HEAP_ID_POKETCH_APP);
}
BOOL ov19_02252504(struct BgConfig * bgConfig)

12
arm9/overlays/20/asm/ov20_02252440.s
View File

@@ -1004,8 +1004,8 @@ ov20_02252B1C: ; 0x02252B1C
.align 2, 0
thumb_func_end ov20_02252B1C
thumb_func_start ov20_02252B28
ov20_02252B28: ; 0x02252B28
thumb_func_start Poketch_PlaySoundEffect
Poketch_PlaySoundEffect: ; 0x02252B28
push {r4, lr}
add r4, r0, #0
bl ov20_02252440
@@ -1020,7 +1020,7 @@ ov20_02252B28: ; 0x02252B28
bl PlaySE
_02252B46:
pop {r4, pc}
thumb_func_end ov20_02252B28
thumb_func_end Poketch_PlaySoundEffect
thumb_func_start ov20_02252B48
ov20_02252B48: ; 0x02252B48
@@ -1040,8 +1040,8 @@ _02252B66:
pop {r4, pc}
thumb_func_end ov20_02252B48
thumb_func_start ov20_02252B68
ov20_02252B68: ; 0x02252B68
thumb_func_start TouchScreen_GetTapState
TouchScreen_GetTapState: ; 0x02252B68
push {r3, r4, r5, lr}
add r5, r0, #0
add r4, r1, #0
@@ -1085,7 +1085,7 @@ _02252BB0:
_02252BB4:
mov r0, #0
pop {r3, r4, r5, pc}
thumb_func_end ov20_02252B68
thumb_func_end TouchScreen_GetTapState
thumb_func_start ov20_02252BB8
ov20_02252BB8: ; 0x02252BB8

2
arm9/overlays/21/src/ov21_02254854.c
View File

@@ -26,7 +26,7 @@ static void ov21_02254840(void)
BOOL ov21_02254854(UnkStruct02254854 **param0, u32 param1, u32 param2, u32 param3)
{
UnkStruct02254854 *alloced = (UnkStruct02254854 *)AllocFromHeap(HEAP_ID_8, sizeof(UnkStruct02254854));
UnkStruct02254854 *alloced = (UnkStruct02254854 *)AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct02254854));
if (alloced != NULL)
{
if (ov21_0225489C(alloced, param1, param2, param3) && SysTask_CreateOnMainQueue((SysTaskFunc)ov21_02254930, (void *)alloced, 1))

2
arm9/overlays/21/src/ov21_02254A6C.c
View File

@@ -40,7 +40,7 @@ extern void ov11_02252DB4(u32 param0, u32 param1);
BOOL ov21_02254A6C(UnkStruct02254A6C *param0, void *param1)
{
UnkStruct02254A6C *strct = (UnkStruct02254A6C *)AllocFromHeap(HEAP_ID_8, 3 << 8);
UnkStruct02254A6C *strct = (UnkStruct02254A6C *)AllocFromHeap(HEAP_ID_POKETCH_APP, 3 << 8);
u32 sp4;
if (strct != NULL)
{

8
arm9/overlays/22/asm/overlay_22.s
View File

@@ -1386,7 +1386,7 @@ ov22_02255268: ; 0x02255268
mov r1, #6
bl BgCommitTilemapBufferToVram
ldr r0, _022552A8 ; =0x00000669
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r5, #0
bl ov22_02255084
pop {r3, r4, r5, pc}
@@ -1482,7 +1482,7 @@ _02255358:
cmp r0, #0
beq _0225537A
ldr r0, _0225537C ; =0x00000669
bl ov20_02252B28
bl Poketch_PlaySoundEffect
ldrb r1, [r5, #3]
ldr r0, [r4, #4]
bl ov22_02255544
@@ -1543,7 +1543,7 @@ _022553D8:
cmp r0, #0
beq _022553FA
ldr r0, _022553FC ; =0x00000669
bl ov20_02252B28
bl Poketch_PlaySoundEffect
ldrb r1, [r5, #3]
ldr r0, [r4, #4]
bl ov22_02255544
@@ -1599,7 +1599,7 @@ _0225543A:
mov r1, #6
bl BgCommitTilemapBufferToVram
ldr r0, _02255498 ; =0x00000666
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r6, #0
bl ov20_022538B0
_02255468:

2
arm9/overlays/23/asm/overlay_23.s
View File

@@ -1293,7 +1293,7 @@ ov23_022551A4: ; 0x022551A4
add r4, r0, #0
ldrh r5, [r5]
ldr r0, _022551F8 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
lsl r3, r5, #2
ldr r0, _022551FC ; =ov23_02255FB9
ldr r2, _02255200 ; =ov23_02255FFC

130
arm9/overlays/24/src/overlay_24_sinit.c
View File

@@ -3,6 +3,19 @@
#include "unk_0200CA44.h"
#include "gf_gfx_loader.h"
typedef struct UnkSubStructOverlay24 UnkSubStructOverlay24;
struct UnkSubStructOverlay24
{
u32* unk0;
BgConfig* config;
u32 unk8;
u8 unkC[0x44];
u32 unk50;
u8 unk54[0x14];
u32* unk68;
u32* unk6C;
Window *window;
};
typedef struct UnkStructOverlay24 UnkStructOverlay24;
struct UnkStructOverlay24
{
@@ -12,26 +25,15 @@ struct UnkStructOverlay24
u8 unk3;
u32 unk4;
u32 unk8;
u32 unkC;
u32 unk10;
u8 unk14[78][75];
u32 lastModifiedX;
u32 lastModifiedY;
u8 pixelData[78][75];
u16 unk16ED;
u32 unk16F0;
u32 unk16F4;
UnkSubStructOverlay24* unk16F4;
u32 unk16F8;
u32 unk16FC;
};
typedef struct UnkSubStructOverlay24 UnkSubStructOverlay24;
struct UnkSubStructOverlay24
{
u32* unk0;
BgConfig* config;
u32 unk8;
u8 unkC[0x5C];
u32* unk68;
u32* unk6C;
Window *window;
};
typedef BOOL (*FnType02254918)(UnkStructOverlay24*);
BOOL ov24_02254854(UnkStructOverlay24**, int, int, int);
@@ -47,12 +49,12 @@ BOOL ov24_02254A70(UnkStructOverlay24*);
BOOL ov24_02254AD4(UnkStructOverlay24*);
void ov24_02254B20(UnkStructOverlay24*, u32, u32, u32, u32);
BOOL ov24_02254C64(UnkStructOverlay24*);
BOOL ov24_02254CA0(u32**, u32*);
BOOL ov24_02254CA0(UnkSubStructOverlay24**, u32*);
BOOL ov24_02254D00(UnkSubStructOverlay24*);
void ov24_02254D48(UnkSubStructOverlay24*);
void ov24_02254D8C(u32, u32);
BOOL ov24_02254DB0(u32, u8);
BOOL ov24_02254DBC(u32);
void ov24_02254D8C(UnkSubStructOverlay24*, u32);
BOOL ov24_02254DB0(UnkSubStructOverlay24*, u8);
BOOL ov24_02254DBC(UnkSubStructOverlay24*);
void ov24_02254DC8(void*);
void ov24_02254DDC(void*, void*);
void ov24_02254EE0(u32, void*);
@@ -68,7 +70,7 @@ extern void ov24_0225499(UnkStructOverlay24*);
extern void ov20_0225298C(u32);
extern BOOL ov20_02252C08(u32);
extern BOOL ov24_02254A70(UnkStructOverlay24*);
extern BOOL ov20_02252B68(u32*, u32*);
extern BOOL TouchScreen_GetTapState(u32*, u32*);
extern BOOL ov24_02254AD4(UnkStructOverlay24*);
extern BOOL ov24_02254CA(u32**, u32);
extern _s32_div_f(void);
@@ -80,12 +82,12 @@ extern void sub_02089444(u32, void*, u32);
extern void ov24_02255078(void*);
extern void ov20_02252D7C(u32, u32);
extern void ov20_02253F28(u32*, u32);
extern void ov20_02252B28(u32);
extern void Poketch_PlaySoundEffect(u32);
extern UnkSubStructOverlay24* ov20_022538A0(void*);
extern void ov20_02253888(u32*, void*);
extern BOOL (ov20_022537B8)(u32);
extern BOOL (ov20_02253794)(u32, u8);
extern void ov20_022537E0(u32*, u32, u32, u32, u32, u32, u32);
extern BOOL (ov20_022537B8)(void*);
extern BOOL (ov20_02253794)(void*, u8);
extern void ov20_022537E0(u32*, u32, void*, void*, void*, u32, u32);
extern FnType02254918 ov24_02255100[3];
extern u32 ov24_0225516C[];
@@ -102,7 +104,7 @@ static void ov24_02254840(void)
#include "sinit.h"
BOOL ov24_02254854(UnkStructOverlay24** arg0, int arg1, int arg2, int arg3) {
UnkStructOverlay24* data = AllocFromHeap(HEAP_ID_8, sizeof(UnkStructOverlay24));
UnkStructOverlay24* data = AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStructOverlay24));
if (data != 0) {
if (ov24_0225489C(data, arg1, arg2, arg3) != 0) {
if (SysTask_CreateOnMainQueue((SysTaskFunc)ov24_02254918, data, 1) != 0) {
@@ -118,7 +120,7 @@ BOOL ov24_02254854(UnkStructOverlay24** arg0, int arg1, int arg2, int arg3) {
BOOL ov24_0225489C(UnkStructOverlay24* arg0, u32 arg1, u32 arg2, u32 arg3) {
arg0->unk16F0 = arg3;
arg0->unk8 = 1;
if (ov24_02254CA0((u32**)&(arg0->unk16F4), &(arg0->unk8))) {
if (ov24_02254CA0(&(arg0->unk16F4), &(arg0->unk8))) {
arg0->unk0 = 0;
arg0->unk1 = 0;
arg0->unk2 = 0;
@@ -132,7 +134,7 @@ BOOL ov24_0225489C(UnkStructOverlay24* arg0, u32 arg1, u32 arg2, u32 arg3) {
void ov24_022548F4(UnkStructOverlay24* arg0) {
ov20_02254198(arg0->unk16FC);
ov24_02254D48((UnkSubStructOverlay24*)(arg0->unk16F4));
ov24_02254D48(arg0->unk16F4);
FreeToHeap(arg0);
}
@@ -198,10 +200,10 @@ u32 ov24_022549F8(UnkStructOverlay24* arg0) {
break;
}
if (arg0->unk3) {
u32 unkC = arg0->unkC;
u32 unk10 = arg0->unk10;
u32 x = arg0->lastModifiedX;
u32 y = arg0->lastModifiedY;
if (ov24_02254AD4(arg0)) {
ov24_02254B20(arg0, unkC, unk10, arg0->unkC, arg0->unk10);
ov24_02254B20(arg0, x, y, arg0->lastModifiedX, arg0->lastModifiedY);
} else {
arg0->unk3 = 0;
}
@@ -218,14 +220,14 @@ u32 ov24_022549F8(UnkStructOverlay24* arg0) {
BOOL ov24_02254A70(UnkStructOverlay24* arg0) {
u32 x, y;
if (ov20_02252B68(&x, &y)) {
if (TouchScreen_GetTapState(&x, &y)) {
if (((x - 16) < 156) & ((y - 16) < 150)) {
x = (x - 16) >> 1;
y = (y - 16) >> 1;
if (arg0->unk14[x][y] != arg0->unk8) {
arg0->unk14[x][y] = arg0->unk8;
arg0->unkC = x;
arg0->unk10 = y;
if (arg0->pixelData[x][y] != arg0->unk8) {
arg0->pixelData[x][y] = arg0->unk8;
arg0->lastModifiedX = x;
arg0->lastModifiedY = y;
return TRUE;
}
}
@@ -235,12 +237,12 @@ BOOL ov24_02254A70(UnkStructOverlay24* arg0) {
BOOL ov24_02254AD4(UnkStructOverlay24* arg0) {
u32 x, y;
if (ov20_02252B68(&x, &y)) {
if (TouchScreen_GetTapState(&x, &y)) {
if (((x - 16) < 156) & ((y - 16) < 150)) {
x = (x - 16) >> 1;
y = (y - 16) >> 1;
arg0->unkC = x;
arg0->unk10 = y;
arg0->lastModifiedX = x;
arg0->lastModifiedY = y;
return TRUE;
}
}
@@ -440,16 +442,16 @@ BOOL ov24_02254C64(UnkStructOverlay24* arg0) {
return FALSE;
}
BOOL ov24_02254CA0(u32** arg0, u32* arg1) {
u32* data = AllocFromHeap(HEAP_ID_8, 0x74);
BOOL ov24_02254CA0(UnkSubStructOverlay24** arg0, u32* arg1) {
UnkSubStructOverlay24* data = AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkSubStructOverlay24));
if (data != 0) {
GF_ASSERT(GF_heap_c_dummy_return_true((HeapID)7));
ov20_022536F4(data + 2, 0x10);
GF_ASSERT(GF_heap_c_dummy_return_true((HeapID)7));
data[0] = (u32)arg1;
data[1] = ov20_02252D34();
data[0x14] = ov20_02252D24();
GF_ASSERT(GF_heap_c_dummy_return_true((HeapID)7));
GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_POKETCH_MAIN));
ov20_022536F4(&(data->unk8), 0x10);
GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_POKETCH_MAIN));
data->unk0 = arg1;
data->config = (BgConfig*)ov20_02252D34();
data->unk50 = ov20_02252D24();
GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_POKETCH_MAIN));
arg0[0] = data;
return TRUE;
}
@@ -457,7 +459,7 @@ BOOL ov24_02254CA0(u32** arg0, u32* arg1) {
}
BOOL ov24_02254D00(UnkSubStructOverlay24* arg0) {
arg0->window = AllocWindows(HEAP_ID_8, 1);
arg0->window = AllocWindows(HEAP_ID_POKETCH_APP, 1);
if (arg0->window) {
AddWindow(arg0->config, arg0->window, &ov24_0225510C);
if (sub_0208946C(arg0->unk0[0x5BA], arg0->window->pixelBuffer, 0x2f80) == 0) {
@@ -470,7 +472,7 @@ BOOL ov24_02254D00(UnkSubStructOverlay24* arg0) {
void ov24_02254D48(UnkSubStructOverlay24* arg0) {
if (arg0) {
GF_ASSERT(GF_heap_c_dummy_return_true((HeapID)7));
GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_POKETCH_MAIN));
if (arg0->window) {
sub_02089444(arg0->unk0[0x5BA], arg0->window->pixelBuffer, 0x2f80);
RemoveWindow(arg0->window);
@@ -480,16 +482,16 @@ void ov24_02254D48(UnkSubStructOverlay24* arg0) {
}
}
void ov24_02254D8C(u32 arg0, u32 arg1) {
ov20_022537E0(ov24_0225516C, arg1, arg0, *(u32*)(arg0), arg0 + 8, 2, 8);
void ov24_02254D8C(UnkSubStructOverlay24* arg0, u32 arg1) {
ov20_022537E0(ov24_0225516C, arg1, arg0, arg0->unk0, &(arg0->unk8), 2, 8);
}
BOOL ov24_02254DB0(u32 arg0, u8 arg1) {
return (*ov20_02253794)(arg0 + 8, arg1);
BOOL ov24_02254DB0(UnkSubStructOverlay24* arg0, u8 arg1) {
return (*ov20_02253794)(&(arg0->unk8), arg1);
}
BOOL ov24_02254DBC(u32 arg0) {
return (*ov20_022537B8)(arg0 + 8);
BOOL ov24_02254DBC(UnkSubStructOverlay24* arg0) {
return (*ov20_022537B8)(&(arg0->unk8));
}
void ov24_02254DC8(void* arg0) {
@@ -497,20 +499,20 @@ void ov24_02254DC8(void* arg0) {
}
void ov24_02254DDC(void* arg0, void* arg1) {
GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_8));
GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_POKETCH_APP));
UnkSubStructOverlay24* v0 = ov20_022538A0(arg1);
InitBgFromTemplate(v0->config, 6, &ov24_02255114, 0);
InitBgFromTemplate(v0->config, 7, &ov24_02255130, 0);
GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_8));
GfGfxLoader_LoadCharData(NARC_GRAPHIC_POKETCH,0x1e,v0->config,6,0,0,1,HEAP_ID_8);
GfGfxLoader_LoadScrnData(NARC_GRAPHIC_POKETCH,0x1f,v0->config,6,0,0,1,HEAP_ID_8);
GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_POKETCH_APP));
GfGfxLoader_LoadCharData(NARC_GRAPHIC_POKETCH,0x1e,v0->config,6,0,0,1,HEAP_ID_POKETCH_APP);
GfGfxLoader_LoadScrnData(NARC_GRAPHIC_POKETCH,0x1f,v0->config,6,0,0,1,HEAP_ID_POKETCH_APP);
ov20_02252D7C(0,0);
GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_8));
GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_POKETCH_APP));
ov24_02254D00(v0);
CopyWindowToVram(v0->window);
GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_8));
GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_POKETCH_APP));
ov24_02255078(v0);
GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_8));
GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_POKETCH_APP));
BgCommitTilemapBufferToVram(v0->config, 7);
u32 v1 = reg_GXS_DB_DISPCNT;
u32 v2 = reg_GXS_DB_DISPCNT;
@@ -528,7 +530,7 @@ void ov24_02254DDC(void* arg0, void* arg1) {
// u32 v1 = dispcnt.visiblePlane | ~0x1F00;
// reg_GXS_DB_DISPCNT = (reg_GXS_DB_DISPCNT & ~0x1F00) | (v1 << 19);
ov24_02254DC8(arg1);
GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_8));
GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_POKETCH_APP));
}
void ov24_02254EE0(u32 arg0, void* arg1) {
@@ -540,7 +542,7 @@ void ov24_02254EE0(u32 arg0, void* arg1) {
ov20_02253F28(v0->unk68, 1);
ov20_02253F28(v0->unk6C, 2);
}
ov20_02252B28(0x663);
Poketch_PlaySoundEffect(1635);
ov24_02254DC8(arg1);
}

2
arm9/overlays/26/asm/ov26_02254854.s
View File

@@ -392,7 +392,7 @@ _02254B04:
beq _02254B90
add r0, sp, #4
add r1, sp, #0
bl ov20_02252B68
bl TouchScreen_GetTapState
cmp r0, #0
beq _02254B90
ldr r1, [sp, #4]

4
arm9/overlays/27/asm/overlay_27.s
View File

@@ -196,7 +196,7 @@ _0225499C:
add r1, r4, #0
add r0, #0x6c
add r1, #0x70
bl ov20_02252B68
bl TouchScreen_GetTapState
add r1, r4, #0
add r1, #0x68
strh r0, [r1]
@@ -1427,7 +1427,7 @@ ov27_022552D0: ; 0x022552D0
mov r1, #6
bl BgCommitTilemapBufferToVram
ldr r0, _02255338 ; =0x00000669
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r6, #0
bl ov27_02254BF4
add sp, #0x10

4
arm9/overlays/28/asm/overlay_28.s
View File

@@ -296,7 +296,7 @@ _02254A64:
add r1, r4, #0
add r0, #0x54
add r1, #0x58
bl ov20_02252B68
bl TouchScreen_GetTapState
add r1, r4, #0
add r1, #0x50
strh r0, [r1]
@@ -2153,7 +2153,7 @@ _02255836:
add r1, r6, #0
bl ov28_02255318
ldr r0, _0225591C ; =0x00000669
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r4, #0
add r0, #0x34
ldrb r0, [r0]

4
arm9/overlays/29/asm/overlay_29.s
View File

@@ -208,7 +208,7 @@ _022549AA:
add r0, r4, #0
bl ov29_02254AA8
ldr r0, _02254A60 ; =0x00000668
bl ov20_02252B28
bl Poketch_PlaySoundEffect
ldr r0, [r4, #0x48]
mov r1, #2
bl ov29_02254CC0
@@ -271,7 +271,7 @@ _02254A3C:
cmp r0, #0
beq _02254A5A
ldr r0, _02254A60 ; =0x00000668
bl ov20_02252B28
bl Poketch_PlaySoundEffect
ldr r0, [r4, #0x48]
mov r1, #2
bl ov29_02254CC0

2
arm9/overlays/30/asm/overlay_30.s
View File

@@ -621,7 +621,7 @@ ov30_02254CC4: ; 0x02254CC4
b _02254CF6
_02254CDE:
ldr r0, _02254D00 ; =0x00000669
bl ov20_02252B28
bl Poketch_PlaySoundEffect
ldr r0, [r4, #0x24]
mov r1, #1
bl ov20_02253F28

2
arm9/overlays/31/asm/overlay_31.s
View File

@@ -611,7 +611,7 @@ ov31_02254CB8: ; 0x02254CB8
b _02254CEA
_02254CD2:
ldr r0, _02254CF4 ; =0x00000669
bl ov20_02252B28
bl Poketch_PlaySoundEffect
ldr r0, [r4, #0x24]
mov r1, #1
bl ov20_02253F28

2
arm9/overlays/32/asm/overlay_32.s
View File

@@ -534,7 +534,7 @@ ov32_02254C08: ; 0x02254C08
bl ov20_022538A4
add r4, r0, #0
ldr r0, _02254C50 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
ldr r0, [r4]
cmp r0, #0
ldr r0, [r5, #0x24]

4
arm9/overlays/34/asm/overlay_34.s
View File

@@ -228,14 +228,14 @@ _022549C4:
mov r1, #2
bl ov34_02254A98
ldr r0, _02254A20 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
ldrb r0, [r4, #1]
add r0, r0, #1
strb r0, [r4, #1]
b _02254A1A
_022549EE:
ldr r0, _02254A24 ; =0x0000066E
bl ov20_02252B28
bl Poketch_PlaySoundEffect
b _02254A1A
_022549F6:
ldr r0, [r4, #0x30]

2
arm9/overlays/35/asm/overlay_35.s
View File

@@ -735,7 +735,7 @@ _02254DB6:
add r0, r4, #0
bl ov35_02254E58
ldr r0, _02254E54 ; =0x00000678
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r5, #0
bl ov20_022538B0
pop {r4, r5, r6, pc}

16
arm9/overlays/36/asm/overlay_36.s
View File

@@ -293,13 +293,13 @@ _02254A4C:
ldr r0, [r4, r0]
bl ov36_02254F0C
ldr r0, _02254BD8 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
mov r0, #1
strb r0, [r4, #1]
b _02254AA6
_02254A82:
ldr r0, _02254BDC ; =0x0000066E
bl ov20_02252B28
bl Poketch_PlaySoundEffect
b _02254AA6
_02254A8A:
add r0, r1, #0
@@ -311,7 +311,7 @@ _02254A8A:
mov r1, #5
bl ov36_02254F0C
ldr r0, _02254BD8 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
mov r0, #3
strb r0, [r4, #1]
_02254AA6:
@@ -368,7 +368,7 @@ _02254AF4:
bne _02254B46
_02254B0C:
ldr r0, _02254BDC ; =0x0000066E
bl ov20_02252B28
bl Poketch_PlaySoundEffect
b _02254B46
_02254B14:
add r0, r1, #0
@@ -390,7 +390,7 @@ _02254B14:
ldr r0, [r4, r0]
bl ov36_02254F0C
ldr r0, _02254BD8 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
mov r0, #2
strb r0, [r4, #1]
_02254B46:
@@ -474,7 +474,7 @@ ov36_02254BE4: ; 0x02254BE4
add r4, r0, #0
add r0, sp, #4
add r1, sp, #0
bl ov20_02252B68
bl TouchScreen_GetTapState
cmp r0, #0
beq _02254C3E
ldr r1, [sp, #4]
@@ -530,7 +530,7 @@ ov36_02254C44: ; 0x02254C44
add r4, r0, #0
add r0, sp, #4
add r1, sp, #0
bl ov20_02252B68
bl TouchScreen_GetTapState
cmp r0, #0
beq _02254C8A
ldr r1, [sp, #4]
@@ -1537,7 +1537,7 @@ _022553CA:
cmp r0, #0
beq _022553E2
ldr r0, _022553E4 ; =0x0000066A
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r5, #0
bl ov36_02254F48
_022553E2:

6
arm9/overlays/37/asm/overlay_37.s
View File

@@ -569,7 +569,7 @@ ov37_02254C44: ; 0x02254C44
pop {r4, r5, r6, pc}
_02254C6C:
ldr r0, _02254D18 ; =0x00000675
bl ov20_02252B28
bl Poketch_PlaySoundEffect
ldr r0, [r4, #0x24]
mov r1, #0
bl ov20_02253F28
@@ -617,13 +617,13 @@ _02254C9E:
cmp r1, r0
ldr r0, _02254D24 ; =0x00000676
bge _02254CE0
bl ov20_02252B28
bl Poketch_PlaySoundEffect
mov r0, #9
lsl r0, r0, #0x10
str r0, [r4, #0x3c]
b _02254D02
_02254CE0:
bl ov20_02252B28
bl Poketch_PlaySoundEffect
ldr r0, [r6]
cmp r0, #0
beq _02254CEE

2
arm9/overlays/38/asm/overlay_38.s
View File

@@ -952,7 +952,7 @@ _02254F56:
ldr r0, [r0, #0x34]
bl ov20_02253F28
ldr r0, _02254F70 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r5, #0
bl ov38_02254D70
pop {r3, r4, r5, pc}

10
arm9/overlays/39/asm/overlay_39.s
View File

@@ -333,7 +333,7 @@ _02254AA8:
b _02254AC4
_02254ABE:
ldr r0, _02254B4C ; =0x0000066E
bl ov20_02252B28
bl Poketch_PlaySoundEffect
_02254AC4:
mov r0, #0
add r4, #0x46
@@ -887,7 +887,7 @@ ov39_02254ECC: ; 0x02254ECC
add r0, r5, #0
bl ov20_022538A4
ldr r0, _02254EF4 ; =0x00000669
bl ov20_02252B28
bl Poketch_PlaySoundEffect
ldr r0, [r4, #0x24]
mov r1, #0xa
bl ov20_02253F28
@@ -929,7 +929,7 @@ ov39_02254F1C: ; 0x02254F1C
add r0, #0x32
ldrb r5, [r0]
ldr r0, _02254F5C ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
lsl r0, r5, #1
add r3, r7, r0
ldrh r0, [r3, #0x24]
@@ -961,7 +961,7 @@ ov39_02254F60: ; 0x02254F60
add r0, #0x33
ldrb r5, [r0]
ldr r0, _02254FA0 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
lsl r0, r5, #1
add r3, r7, r0
ldrh r0, [r3, #0x24]
@@ -1326,7 +1326,7 @@ _0225522C:
ldr r0, [r4, #0x6c]
lsl r1, r1, #2
ldr r0, [r0, r1]
bl ov20_02252B28
bl Poketch_PlaySoundEffect
b _02255276
_02255240:
ldr r0, [r4, #0x2c]

10
arm9/overlays/40/asm/overlay_40.s
View File

@@ -319,7 +319,7 @@ _02254A9A:
mov r0, #0
str r0, [r4, #0x1c]
ldr r0, _02254B4C ; =0x0000066E
bl ov20_02252B28
bl Poketch_PlaySoundEffect
b _02254B46
_02254AB0:
cmp r1, #1
@@ -465,7 +465,7 @@ _02254BB2:
cmp r0, #0
bne _02254BC4
ldr r0, _02254C18 ; =0x0000066E
bl ov20_02252B28
bl Poketch_PlaySoundEffect
b _02254C12
_02254BC4:
add r0, r4, #0
@@ -1139,7 +1139,7 @@ ov40_022550C0: ; 0x022550C0
bl ov20_022538A4
add r4, r0, #0
ldr r0, _02255138 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
ldr r0, [r5, #0x34]
mov r1, #3
bl ov20_02253F28
@@ -1191,7 +1191,7 @@ ov40_0225513C: ; 0x0225513C
bl ov20_022538A4
add r4, r0, #0
ldr r0, _022551B4 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
ldr r0, [r5, #0x34]
mov r1, #2
bl ov20_02253F28
@@ -1299,7 +1299,7 @@ _0225521A:
mov r1, #1
bl ov20_02253F28
ldr r0, _02255304 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
ldr r0, _02255308 ; =0x00000126
bl ov20_02252B48
add r0, r4, #0

32
arm9/overlays/41/asm/overlay_41.s
View File

@@ -501,11 +501,11 @@ _02254BBA:
mov r1, #5
bl ov41_022553A4
ldr r0, _02254D18 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
b _02254C32
_02254BEE:
ldr r0, _02254D18 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r4, #0
bl ov41_0225504C
mov r3, #0
@@ -531,7 +531,7 @@ _02254BEE:
b _02254C32
_02254C2C:
ldr r0, _02254D1C ; =0x0000066E
bl ov20_02252B28
bl Poketch_PlaySoundEffect
_02254C32:
mov r0, #0
pop {r4, pc}
@@ -714,11 +714,11 @@ _02254D6C:
b _02254E00
_02254D86:
ldr r0, _02254E04 ; =0x0000066E
bl ov20_02252B28
bl Poketch_PlaySoundEffect
b _02254E00
_02254D8E:
ldr r0, _02254E08 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r4, #0
mov r1, #1
mov r2, #0
@@ -738,7 +738,7 @@ _02254D8E:
b _02254E00
_02254DC0:
ldr r0, _02254E08 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r4, #0
mov r1, #0
mov r2, #1
@@ -796,7 +796,7 @@ _02254E20:
b _02254EAC
_02254E3A:
ldr r0, _02254EB0 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
mov r1, #1
add r0, r4, #0
add r2, r1, #0
@@ -813,11 +813,11 @@ _02254E3A:
b _02254EAC
_02254E64:
ldr r0, _02254EB4 ; =0x0000066E
bl ov20_02252B28
bl Poketch_PlaySoundEffect
b _02254EAC
_02254E6C:
ldr r0, _02254EB0 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r4, #0
mov r1, #0
mov r2, #1
@@ -875,11 +875,11 @@ _02254ECC:
b _02254F52
_02254EE6:
ldr r0, _02254F58 ; =0x0000066E
bl ov20_02252B28
bl Poketch_PlaySoundEffect
b _02254F52
_02254EEE:
ldr r0, _02254F5C ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r4, #0
mov r1, #0
mov r2, #1
@@ -900,7 +900,7 @@ _02254EEE:
b _02254F52
_02254F20:
ldr r0, _02254F5C ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r4, #0
mov r1, #0
mov r2, #1
@@ -953,7 +953,7 @@ _02254F74:
b _0225500A
_02254F8E:
ldr r0, _02255010 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
mov r1, #0
add r0, r4, #0
add r2, r1, #0
@@ -971,11 +971,11 @@ _02254F8E:
b _0225500A
_02254FBA:
ldr r0, _02255014 ; =0x0000066E
bl ov20_02252B28
bl Poketch_PlaySoundEffect
b _0225500A
_02254FC2:
ldr r0, _02255010 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r4, #0
mov r1, #0
mov r2, #1
@@ -1859,7 +1859,7 @@ _02255670:
bl ov20_02253F28
_0225567E:
ldr r0, _0225568C ; =0x00000677
bl ov20_02252B28
bl Poketch_PlaySoundEffect
mov r0, #0
add r4, #0xa4
str r0, [r4]

2
arm9/overlays/42/asm/overlay_42.s
View File

@@ -399,7 +399,7 @@ _02254B40:
str r0, [r4, #0xc]
add r0, sp, #4
add r1, sp, #0
bl ov20_02252B68
bl TouchScreen_GetTapState
cmp r0, #0
beq _02254B68
ldr r0, [r4, #0x28]

2
arm9/overlays/43/asm/overlay_43.s
View File

@@ -765,7 +765,7 @@ _02254DCE:
orr r0, r1
strb r0, [r2, #1]
ldr r0, _02254E74 ; =0x00000678
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r5, #0
bl ov20_022538B0
pop {r3, r4, r5, pc}

2
arm9/overlays/44/asm/ov44_02254A54.s
View File

@@ -249,7 +249,7 @@ ov44_02254C14: ; 0x02254C14
bl ov20_022538A4
add r4, r0, #0
ldr r0, _02254C50 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
mov r0, #0
add r1, r0, #0
bl ov20_02252D7C

12
arm9/overlays/47/asm/overlay_47.s
View File

@@ -213,7 +213,7 @@ _022549CA:
b _022549DA
_022549D4:
ldr r0, _022549E0 ; =0x0000066E
bl ov20_02252B28
bl Poketch_PlaySoundEffect
_022549DA:
mov r0, #0
pop {r3, r4, r5, pc}
@@ -993,7 +993,7 @@ ov47_02254F58: ; 0x02254F58
add r0, r4, #0
bl ov47_022550FC
ldr r0, _02254F98 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r5, #0
bl ov47_02254E60
pop {r3, r4, r5, pc}
@@ -1026,7 +1026,7 @@ ov47_02254F9C: ; 0x02254F9C
add r0, r4, #0
bl ov47_02255184
ldr r0, _02254FE4 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r5, #0
bl ov47_02254E60
pop {r3, r4, r5, pc}
@@ -1059,7 +1059,7 @@ ov47_02254FE8: ; 0x02254FE8
add r0, r4, #0
bl ov47_022551D8
ldr r0, _02255030 ; =0x0000066E
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r5, #0
bl ov47_02254E60
pop {r3, r4, r5, pc}
@@ -1092,7 +1092,7 @@ ov47_02255034: ; 0x02255034
add r0, r4, #0
bl ov47_02255250
ldr r0, _0225507C ; =0x0000066E
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r5, #0
bl ov47_02254E60
pop {r3, r4, r5, pc}
@@ -1129,7 +1129,7 @@ ov47_02255080: ; 0x02255080
add r1, r6, #0
bl ov47_022552D8
ldr r0, _022550D4 ; =0x00000663
bl ov20_02252B28
bl Poketch_PlaySoundEffect
add r0, r5, #0
bl ov47_02254E60
pop {r4, r5, r6, pc}

3
include/heap.h
View File

@@ -12,7 +12,8 @@ typedef enum HeapID {
HEAP_ID_2,
HEAP_ID_MAIN,
HEAP_ID_4,
HEAP_ID_8 = 8,
HEAP_ID_POKETCH_MAIN = 7,
HEAP_ID_POKETCH_APP,
HEAP_ID_FIELD = 11,
HEAP_ID_15 = 15,
HEAP_ID_32 = 32,