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

begin working on evolution graphics

Browse Source
This commit is contained in:
DizzyEggg 2017-10-27 14:59:55 +02:00
parent 5ea2f463d7
commit 0f992c8f5c
4 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
asm/evolution_graphics.s
View File

@ -5,40 +5,6 @@
.text
thumb_func_start nullsub_67
nullsub_67: @ 817BA40
bx lr
thumb_func_end nullsub_67
thumb_func_start sub_817BA44
sub_817BA44: @ 817BA44
push {r4,r5,lr}
sub sp, 0x4
movs r4, 0
ldr r5, =gUnknown_085F5458
_0817BA4C:
adds r0, r4, 0
adds r0, 0x14
lsls r0, 24
lsrs r0, 24
lsls r1, r4, 1
adds r1, r5
ldrh r1, [r1]
str r1, [sp]
movs r2, 0
movs r3, 0
bl SetOamMatrix
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0xB
bls _0817BA4C
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_817BA44
thumb_func_start sub_817BA7C
sub_817BA7C: @ 817BA7C
@ -603,7 +569,7 @@ sub_817BEC4: @ 817BEC4
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl sub_817BA44
bl SetEvoSparklesMatrices
ldr r0, =gTasks
lsls r5, r4, 2
adds r5, r4
@ -738,7 +704,7 @@ sub_817BFCC: @ 817BFCC
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl sub_817BA44
bl SetEvoSparklesMatrices
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
@ -832,7 +798,7 @@ sub_817C080: @ 817C080
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl sub_817BA44
bl SetEvoSparklesMatrices
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
@ -958,7 +924,7 @@ sub_817C174: @ 817C174
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl sub_817BA44
bl SetEvoSparklesMatrices
ldr r0, =gTasks
lsls r5, r4, 2
adds r5, r4
@ -1105,7 +1071,7 @@ sub_817C2B0: @ 817C2B0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl sub_817BA44
bl SetEvoSparklesMatrices
ldr r0, =gTasks
lsls r5, r4, 2
adds r5, r4

3
data/evolution_graphics.s
View File

@ -13,6 +13,3 @@ gUnknown_085F541C:: @ 85F541C
gUnknown_085F5440:: @ 85F5440
.incbin "baserom.gba", 0x5f5440, 0x18
gUnknown_085F5458:: @ 85F5458
.incbin "baserom.gba", 0x5f5458, 0x38

2
ld_script.txt
View File

@ -225,6 +225,7 @@ SECTIONS {
asm/pokeblock_feed.o(.text);
src/clear_save_data_screen.o(.text);
asm/intro_credits_graphics.o(.text);
src/evolution_graphics.o(.text);
asm/evolution_graphics.o(.text);
asm/bard_music.o(.text);
asm/fldeff_teleport.o(.text);
@ -448,6 +449,7 @@ SECTIONS {
src/clear_save_data_screen.o(.rodata);
data/intro_credits_graphics.o(.rodata);
data/evolution_graphics.o(.rodata);
src/evolution_graphics.o(.rodata);
data/bard_music.o(.rodata);
data/data_860A4AC.o(.rodata);
data/battle_controller_recorded_opponent.o(.rodata);

31
src/evolution_graphics.c Normal file
View File

@ -0,0 +1,31 @@
#include "global.h"
//#include "evolution_graphics.h"
#include "sprite.h"
#include "trig.h"
#include "rng.h"
#include "decompress.h"
#include "task.h"
#include "sound.h"
#include "songs.h"
#include "palette.h"
static const s16 sEvoSparkleMatricies[] =
{
0x3C0, 0x380, 0x340, 0x300, 0x2C0, 0x280, 0x240, 0x200, 0x1C0,
0x180, 0x140, 0x100, -4, 0x10, -3, 0x30, -2, 0x50,
-1, 0x70, 0x1, 0x70, 0x2, 0x50, 0x3, 0x30, 0x4, 0x10
};
void EvoSparkle_DummySpriteCb(struct Sprite *sprite)
{
}
void SetEvoSparklesMatrices(void)
{
u16 i;
for (i = 0; i < 12; i++)
{
SetOamMatrix(20 + i, sEvoSparkleMatricies[i], 0, 0, sEvoSparkleMatricies[i]);
}
}