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

split C file to correct rodata order

Browse Source
This commit is contained in:
Lincoln-LM
2024-09-03 16:56:34 -06:00
parent 1f8c98a3ed
commit 68f2c0d61c
4 changed files with 54 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arm9/arm9.lsf
View File

@@ -904,8 +904,8 @@ Overlay OVERLAY_24
{
##Memo Pad##
After OVERLAY_20
Object overlay_24_c.o
Object overlay_24.o
Object overlay_24_a.o
Object overlay_24_b.o
}
Overlay OVERLAY_25

45
arm9/overlays/24/asm/overlay_24.s
View File

@@ -1,45 +0,0 @@
.include "asm/macros.inc"
.include "global.inc"
.section .text
.balign 4, 0
.section .rodata
.global ov24_022550F8
ov24_022550F8: ; 0x022550F8
.byte 0x18, 0x58, 0xB4, 0xCC, 0x68, 0xA8, 0xB4, 0xCC
.global ov24_02255100
ov24_02255100: ; 0x02255100
.word ov24_022549AC, ov24_022549F8, ov24_02254C64
.global ov24_0225510C
ov24_0225510C: ; 0x0225510C
.byte 0x07, 0x02, 0x02, 0x14, 0x13, 0x00, 0x0C, 0x00
.global ov24_02255114
ov24_02255114: ; 0x02255114
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00
.byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov24_02255130
ov24_02255130: ; 0x02255130
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0F, 0x00, 0x00, 0x03, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global ov24_0225514C
ov24_0225514C: ; 0x0225514C
.byte 0x00, 0x00, 0x0C, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x02
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x80, 0x08, 0x00, 0x03, 0x00, 0x00, 0x02
.byte 0x00, 0x00, 0x00, 0x00
.global ov24_0225516C
ov24_0225516C: ; 0x0225516C
.word 0x00, ov24_02254DDC, 0x00
.word 0x01, ov24_02254EE0, 0x00
.word 0x02, ov24_02254F28, 0x00
.word 0x03, ov24_02254F40, 0x00
.word 0x04, ov24_02255038, 0x00
.word 0x05, ov24_02255050, 0x00
.word 0x00, 0x00000000, 0x00

13
arm9/overlays/24/src/overlay_24_c.c → arm9/overlays/24/src/overlay_24_a.c
View File

@@ -31,14 +31,17 @@ extern u32* ov20_02253E74(u32, void*, void*);
extern void ov20_02254014(void*);
extern void ov20_02253F14(u32, void*);
// TODO: rodata
extern const FnType02254918 ov24_02255100[3];
extern const u32 ov24_0225514C[2][4];
extern const u32 ov24_0225516C[];
extern const u8 ov24_022550F8[];
const FnType02254918 ov24_02255100[3] = {
ov24_022549AC, ov24_022549F8, ov24_02254C64
};
const u8 ov24_022550F8[] = {
0x18, 0x58, 0xB4, 0xCC, 0x68, 0xA8, 0xB4, 0xCC
};
extern const WindowTemplate ov24_0225510C;
extern const BgTemplate ov24_02255114;
extern const BgTemplate ov24_02255130;
extern const u32 ov24_0225514C[2][4];
extern const u32 ov24_0225516C[];
static void ov24_02254840(void)
{

44
arm9/overlays/24/src/overlay_24_b.c Normal file
View File

@@ -0,0 +1,44 @@
#include "global.h"
#include "bg_window.h"
#include "unk_0200CA44.h"
#include "gf_gfx_loader.h"
#include "overlay_24.h"
const WindowTemplate ov24_0225510C = {
0x07, 0x02, 0x02, 0x14, 0x13, 0x00, 0x0C
};
const BgTemplate ov24_02255130 = {
0, 0, 0x800, 0, 1, 0, 0xf, 0, 0, 3, 0, 0, 0
};
const BgTemplate ov24_02255114 = {
0x0,
0x0,
0x0,
0x0,
1,
0,
0xe,
0,
0,
2,
0,
0,
0
};
const u32 ov24_0225514C[2][4] = {
{
0xC0000, 0x38000, 0x2000000, 0x0
},
{
0xC0000, 0x88000, 0x2000003, 0x0
}
};
const u32 ov24_0225516C[] = {
0x00, (u32)ov24_02254DDC, 0x00,
0x01, (u32)ov24_02254EE0, 0x00,
0x02, (u32)ov24_02254F28, 0x00,
0x03, (u32)ov24_02254F40, 0x00,
0x04, (u32)ov24_02255038, 0x00,
0x05, (u32)ov24_02255050, 0x00,
0x00, 0x00000000, 0x00,
};