diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-06 18:41:32 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-06 18:41:32 +0100 |
| commit | a729e9838e88a982b590aafbd6330fc80c1f32e2 (patch) | |
| tree | 2b325623726b424c77fb354e7546905bd2b42758 /data | |
| parent | a2263207bf64439c9ad35ad5b8f0d5c5ea289d30 (diff) | |
move data to hall of fame c file
Diffstat (limited to 'data')
| -rw-r--r-- | data/graphics.s | 26 | ||||
| -rw-r--r-- | data/hall_of_fame.s | 46 |
2 files changed, 25 insertions, 47 deletions
diff --git a/data/graphics.s b/data/graphics.s index e89177a1d..c3bbdd494 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -156,7 +156,31 @@ gUnknown_08C2CEE0:: @ 8C2CEE0 .incbin "baserom.gba", 0xc2cee0, 0x240 gUnknown_08C2D120:: @ 8C2D120 - .incbin "baserom.gba", 0xc2d120, 0x600 + .incbin "baserom.gba", 0xc2d120, 552 + +gUnknown_08C2D348:: @ 8C2D348 + .incbin "baserom.gba", 0xC2D348, 196 + +gUnknown_08C2D40C:: @ 8C2D40C + .incbin "baserom.gba", 0xC2D40C, 28 + +gContestConfetti_Gfx:: @ 8C2D428 + .incbin "baserom.gba", 0xC2D428, 288 + +gContestConfetti_Pal:: @ 8C2D548 + .incbin "baserom.gba", 0xC2D548, 40 + +gUnknown_08C2D570:: @ 8C2D570 + .incbin "baserom.gba", 0xC2D570, 316 + +gUnknown_08C2D6AC:: @ 8C2D6AC + .incbin "baserom.gba", 0xC2D6AC, 36 + +gUnknown_08C2D6D0:: @ 8C2D6D0 + .incbin "baserom.gba", 0xC2D6D0, 40 + +gUnknown_08C2D6F8:: @ 8C2D6F8 + .incbin "baserom.gba", 0xC2D6F8, 40 gUnknown_08C2D720:: @ 8C2D720 .incbin "baserom.gba", 0xc2d720, 0x210 diff --git a/data/hall_of_fame.s b/data/hall_of_fame.s deleted file mode 100644 index 7771224e7..000000000 --- a/data/hall_of_fame.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_085E5374:: @ 85E5374 - .incbin "baserom.gba", 0x5e5374, 0xc - -gUnknown_085E5380:: @ 85E5380 - .incbin "baserom.gba", 0x5e5380, 0x8 - -gUnknown_085E5388:: @ 85E5388 - .incbin "baserom.gba", 0x5e5388, 0x4 - -gUnknown_085E538C:: @ 85E538C - .incbin "baserom.gba", 0x5e538c, 0x8 - -sHallOfFame_ConfettiSpriteSheet:: @ 85E5394 - .incbin "baserom.gba", 0x5e5394, 0x10 - -sHallOfFame_ConfettiSpritePalette:: @ 85E53A4 - .incbin "baserom.gba", 0x5e53a4, 0x10 - -sHallOfFame_MonsFullTeamPositions:: @ 85E53B4 - .incbin "baserom.gba", 0x5e53b4, 0x6 - -gUnknown_085E53BA:: @ 85E53BA - .incbin "baserom.gba", 0x5e53ba, 0x2a - -sHallOfFame_MonsHalfTeamPositions:: @ 85E53E4 - .incbin "baserom.gba", 0x5e53e4, 0x18 - -gUnknown_085E53FC:: @ 85E53FC - .incbin "baserom.gba", 0x5e53fc, 0xd4 - -gUnknown_085E54D0:: @ 85E54D0 - .incbin "baserom.gba", 0x5e54d0, 0x18 - -gHallOfFame_Pal:: @ 85E54E8 - .incbin "baserom.gba", 0x5e54e8, 0x20 - -gUnknown_085E5508:: @ 85E5508 - .incbin "baserom.gba", 0x5e5508, 0x1cc - -sDummyFameMon:: @ 85E56D4 - .incbin "baserom.gba", 0x5e56d4, 0x1c |