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

split out graphics data

Browse Source
This commit is contained in:
YamaArashi 2016-09-03 03:03:50 -07:00
parent 8866801ef9
commit c9b1c40b86
7 changed files with 1103 additions and 1084 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -64,7 +64,8 @@ asm/libagbsyscall.o \
asm/libgcc.o \ asm/libgcc.o \
asm/libc.o asm/libc.o
DATA_ASM_OBJS := data/data1.o data/data2.o DATA_ASM_OBJS := data/data1.o data/data2.o data/anim_mon_front_pics.o \
data/graphics.o
OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS)

4
asm/macros.s
View File

@ -26,10 +26,6 @@
.2byte 0@ padding .2byte 0@ padding
.endm .endm
.macro zero_fill count
.fill \count
.endm
@ Berry trees have a table defining the palette slot used for each of their 5 @ Berry trees have a table defining the palette slot used for each of their 5
@ stages. However, the first 2 stages always use the same slots regardless of @ stages. However, the first 2 stages always use the same slots regardless of
@ the type of tree and the slots of the last 3 stages always equal each other. @ the type of tree and the slots of the last 3 stages always equal each other.

2
data/graphics/pokemon/mon_front_pics.s → data/anim_mon_front_pics.s
View File

@ -1,3 +1,5 @@
.section anim_mon_front_pic_data, "aw", %progbits
.align 2, 0 .align 2, 0
gMonFrontPic_CircledQuestionMark:: @ 8B00000 gMonFrontPic_CircledQuestionMark:: @ 8B00000

1077
data/data2.s
View File

File diff suppressed because it is too large Load Diff

1071
data/graphics.s Normal file
View File

File diff suppressed because it is too large Load Diff

4
data/graphics/field_objects/field_object_graphics.s
View File

@ -188,7 +188,7 @@ gFieldObjectPic_RubySapphireBrendan_17:: @ 8499918
gFieldObjectPalette33:: @ 8499A18 gFieldObjectPalette33:: @ 8499A18
.incbin "data/graphics/field_objects/palettes/field_object_palette_33.gbapal" .incbin "data/graphics/field_objects/palettes/field_object_palette_33.gbapal"
zero_fill 0x8499c18 - 0x8499a38 .space 0x1E0
.align 2, 0 .align 2, 0
@ -780,7 +780,7 @@ gFieldObjectPalette34:: @ 84A54B8
gUnusedFieldObjectPalette:: @ 84A54D8 gUnusedFieldObjectPalette:: @ 84A54D8
.incbin "data/graphics/field_objects/palettes/unused_palette.gbapal" .incbin "data/graphics/field_objects/palettes/unused_palette.gbapal"
zero_fill 0x84a56b8 - 0x84a54f8 .space 0x1C0
.align 2, 0 .align 2, 0

26
ld_script.txt
View File

@ -71,6 +71,32 @@ SECTIONS {
data/data2.o(.rodata); data/data2.o(.rodata);
} =0 } =0
gap1 :
{
gap1_start = ABSOLUTE(.);
BYTE(0x00)
. = 0x8B00000 - gap1_start;
} =0
anim_mon_front_pic_data :
ALIGN(4)
{
data/anim_mon_front_pics.o(anim_mon_front_pic_data);
} =0
gap2 :
{
gap2_start = ABSOLUTE(.);
BYTE(0x00)
. = 0x8C00000 - gap2_start;
} =0
gfx_data :
ALIGN(4)
{
data/graphics.o(gfx_data);
} =0
/* Discard everything not specifically mentioned above. */ /* Discard everything not specifically mentioned above. */
/DISCARD/ : /DISCARD/ :
{ {