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

formatting

Browse Source
This commit is contained in:
YamaArashi 2016-11-01 08:35:13 -07:00
parent a793e62d83
commit 4db33778ad
2 changed files with 147 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/graphics.s
View File

@ -716,21 +716,19 @@ gUnknown_08DC3A0C:: @ 8DC3A0C
gUnknown_08DC3CD4:: @ 8DC3CD4 gUnknown_08DC3CD4:: @ 8DC3CD4
.incbin "baserom.gba", 0xdc3cd4, 0x80 .incbin "baserom.gba", 0xdc3cd4, 0x80
.align 2
gIntroCopyright_Pal:: @ 8DC3D54 gIntroCopyright_Pal:: @ 8DC3D54
.incbin "graphics/intro/copyright.gbapal" .incbin "graphics/intro/copyright.gbapal"
.align 2 .align 2
gIntroCopyright_Gfx:: @ 8DC3D74 gIntroCopyright_Gfx:: @ 8DC3D74
.incbin "graphics/intro/copyright.4bpp.lz" .incbin "graphics/intro/copyright.4bpp.lz"
.align 2 .align 2
gIntroCopyright_Tilemap:: @ 8DC3FD4 gIntroCopyright_Tilemap:: @ 8DC3FD4
.incbin "graphics/intro/copyright.bin.lz" .incbin "graphics/intro/copyright.bin.lz"
.align 2 .align 2
gUnknown_08DC4120:: @ 8DC4120 gUnknown_08DC4120:: @ 8DC4120
.incbin "baserom.gba", 0xdc4120, 0x20 .incbin "baserom.gba", 0xdc4120, 0x20

6
src/libc.c
View File

@ -149,11 +149,11 @@ char* strcpy(char *dst0, const char *src0)
unsigned long *a1; unsigned long *a1;
const unsigned long *a2; const unsigned long *a2;
/* If SRC or DEST is unaligned, then copy bytes. */ // If SRC or DEST is unaligned, then copy bytes.
if(!(UNALIGNED(src) | UNALIGNED(dst))) if(!(UNALIGNED(src) | UNALIGNED(dst)))
{ {
/* SRC and DEST are both "long int" aligned, try to do "long int" // SRC and DEST are both "long int" aligned, try to do "long int"
sized copies. */ // sized copies.
a1 = (unsigned long *)dst; a1 = (unsigned long *)dst;
a2 = (unsigned long *)src; a2 = (unsigned long *)src;
while(!CONTAINSNULL(*a2)) while(!CONTAINSNULL(*a2))