ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into decomp_script

Browse Source
This commit is contained in:
DizzyEggg 2017-09-11 09:22:10 +02:00
commit 48239b6598
8 changed files with 1657 additions and 3392 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3365
asm/bg.s
View File

File diff suppressed because it is too large Load Diff

1
common_syms/bg.txt Normal file
View File

@ -0,0 +1 @@
gUnneededFireRedVariable

7
data/bg.s
View File

@ -1,7 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gZeroedBgControlStruct:: @ 82E9580
.4byte 0

11
include/gba/defines.h
View File

@ -15,6 +15,11 @@
#define INTR_CHECK (*(u16 *)0x3007FF8)
#define INTR_VECTOR (*(void **)0x3007FFC)
#define EWRAM_START 0x02000000
#define EWRAM_END (EWRAM_START + 0x40000)
#define IWRAM_START 0x03000000
#define IWRAM_END (IWRAM_START + 0x8000)
#define PLTT 0x5000000
#define PLTT_SIZE 0x400
@ -29,8 +34,10 @@
#define BG_VRAM VRAM
#define BG_VRAM_SIZE 0x10000
#define BG_CHAR_ADDR(n) (BG_VRAM + (0x4000 * (n)))
#define BG_SCREEN_ADDR(n) (BG_VRAM + (0x800 * (n)))
#define BG_CHAR_SIZE 0x4000
#define BG_SCREEN_SIZE 0x800
#define BG_CHAR_ADDR(n) (BG_VRAM + (BG_CHAR_SIZE * (n)))
#define BG_SCREEN_ADDR(n) (BG_VRAM + (BG_SCREEN_SIZE * (n)))
// text-mode BG
#define OBJ_VRAM0 (VRAM + 0x10000)

4
ld_script.txt
View File

@ -45,7 +45,7 @@ SECTIONS {
src/malloc.o(.text);
src/dma3_manager.o(.text);
src/gpu_regs.o(.text);
asm/bg.o(.text);
src/bg.o(.text);
asm/blit.o(.text);
src/window.o(.text);
src/text.o(.text);
@ -286,7 +286,7 @@ SECTIONS {
ALIGN(4)
{
src/main.o(.rodata);
data/bg.o(.rodata);
src/bg.o(.rodata);
src/window.o(.rodata);
src/text.o(.rodata);
src/sprite.o(.rodata);

1642
src/bg.c Normal file
View File

File diff suppressed because it is too large Load Diff

15
sym_bss.txt
View File

@ -23,20 +23,7 @@ gDma3RequestCursor: @ 3000811
.space 0x7
.include "src/gpu_regs.o"
.align 4
gUnknown_030008E0: @ 30008E0
.space 0x18
gUnknown_030008F8: @ 30008F8
.space 0x4
gUnknown_030008FC: @ 30008FC
.space 0x3C
gUnknown_03000938: @ 3000938
.space 0x10
.include "src/bg.o"
.include "src/text.o"
.include "src/sprite.o"

4
sym_common.txt
View File

@ -39,9 +39,9 @@ IntrMain_Buffer: @ 3002750
gPcmDmaCounter: @ 3002F50
.space 0x4
gUnneededFireRedVariable: @ 3002F54
.space 0xC
.include "bg.o"
.align 4
gUnknown_03002F60: @ 3002F60
.space 0x10