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

Sanitize data/tilesets.s

Browse Source
This commit is contained in:
PikalaxALT 2017-09-30 22:23:00 -04:00
parent a1ccd78218
commit 4d78e62fd9
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/battle_anim.s
View File

@ -449,10 +449,10 @@ ma00_load_graphics: @ 80A3D24
lsls r0, 8
orrs r4, r0
lsls r5, r4, 3
ldr r0, =gUnknown_085112C4
ldr r0, =gUnknown_085112B4 + 0x10
adds r0, r5, r0
bl LoadCompressedObjectPicUsingHeap
ldr r0, =gUnknown_08511BCC
ldr r0, =gUnknown_08511A34 + 0x198
adds r5, r0
adds r0, r5, 0
bl LoadCompressedObjectPaletteUsingHeap

26
data/tileset.s
View File

@ -11,8 +11,9 @@ gUnknown_08510644::
.incbin "baserom.gba", 0x510644, 0x80
gUnknown_085106C4::
.incbin "baserom.gba", 0x5106c4, 0xa0
.incbin "baserom.gba", 0x5106c4, 0x80
.space 0x20
gUnknown_08510764:: @ 8510764
@ replacing .incbin "baserom.gba", 0x00510764, 0x10
@ -31,21 +32,13 @@ gUnknown_08510EF4::
.incbin "baserom.gba", 0x510ef4, 0x3c0
gUnknown_085112B4::
.incbin "baserom.gba", 0x5112b4, 0x10
gUnknown_085112C4:: @ 85112C4
.incbin "baserom.gba", 0x5112c4, 0x3b0
.incbin "baserom.gba", 0x5112b4, 0x3c0
gUnknown_08511674::
.incbin "baserom.gba", 0x511674, 0x3c0
gUnknown_08511A34::
.incbin "baserom.gba", 0x511a34, 0x198
gUnknown_08511BCC:: @ 8511BCC
.incbin "baserom.gba", 0x511bcc, 0x228
.incbin "baserom.gba", 0x511a34, 0x3c0
gUnknown_08511DF4::
.incbin "baserom.gba", 0x511df4, 0x3c0
@ -259,8 +252,9 @@ gUnknown_08515224::
.incbin "baserom.gba", 0x515224, 0x80
gUnknown_085152A4::
.incbin "baserom.gba", 0x5152a4, 0xa0
.incbin "baserom.gba", 0x5152a4, 0x80
.space 0x20
gUnknown_08515344:: @ 8515344
@ replacing .incbin "baserom.gba", 0x00515344, 0x20
@ -372,7 +366,9 @@ gUnknown_08515844::
.incbin "baserom.gba", 0x515844, 0x80
gUnknown_085158C4::
.incbin "baserom.gba", 0x5158c4, 0xa0
.incbin "baserom.gba", 0x5158c4, 0x80
.space 0x20
gUnknown_08515964:: @ 8515964
@ -422,7 +418,9 @@ gUnknown_0851609C::
.incbin "baserom.gba", 0x51609c, 0x80
gUnknown_0851611C::
.incbin "baserom.gba", 0x51611c, 0xa0
.incbin "baserom.gba", 0x51611c, 0x80
.space 0x20
gUnknown_085161BC:: @ 85161BC