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

Add anim tag sprite defines

Browse Source
This commit is contained in:
DizzyEggg 2018-09-15 00:30:20 +02:00
parent a08d9dd451
commit 2a7811456a
6 changed files with 633 additions and 681 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
asm/battle_anim_80FE840.s
View File

@ -18033,8 +18033,8 @@ _0810794C:
bx r0 bx r0
thumb_func_end sub_810790C thumb_func_end sub_810790C
thumb_func_start sub_8107954 thumb_func_start AnimTask_CreateSurfWave
sub_8107954: @ 8107954 AnimTask_CreateSurfWave: @ 8107954
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@ -18256,7 +18256,7 @@ _08107B58:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_8107954 thumb_func_end AnimTask_CreateSurfWave
thumb_func_start sub_8107B84 thumb_func_start sub_8107B84
sub_8107B84: @ 8107B84 sub_8107B84: @ 8107B84
@ -22914,8 +22914,8 @@ _0810A054:
.pool .pool
thumb_func_end sub_8109E2C thumb_func_end sub_8109E2C
thumb_func_start sub_810A060 thumb_func_start AnimTask_BlendBackground
sub_810A060: @ 810A060 AnimTask_BlendBackground: @ 810A060
push {r4,lr} push {r4,lr}
sub sp, 0x10 sub sp, 0x10
adds r4, r0, 0 adds r4, r0, 0
@ -22938,7 +22938,7 @@ sub_810A060: @ 810A060
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_810A060 thumb_func_end AnimTask_BlendBackground
thumb_func_start sub_810A094 thumb_func_start sub_810A094
sub_810A094: @ 810A094 sub_810A094: @ 810A094
@ -36190,8 +36190,8 @@ _08110BC6:
bx r0 bx r0
thumb_func_end sub_8110B80 thumb_func_end sub_8110B80
thumb_func_start sub_8110BCC thumb_func_start AnimTask_LoadSandstormBackground
sub_8110BCC: @ 8110BCC AnimTask_LoadSandstormBackground: @ 8110BCC
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x10 sub sp, 0x10
lsls r0, 24 lsls r0, 24
@ -36275,7 +36275,7 @@ _08110C6E:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_8110BCC thumb_func_end AnimTask_LoadSandstormBackground
thumb_func_start sub_8110CB0 thumb_func_start sub_8110CB0
sub_8110CB0: @ 8110CB0 sub_8110CB0: @ 8110CB0
@ -47427,8 +47427,8 @@ _08116832:
.pool .pool
thumb_func_end sub_811675C thumb_func_end sub_811675C
thumb_func_start sub_8116848 thumb_func_start AnimTask_BlendParticle
sub_8116848: @ 8116848 AnimTask_BlendParticle: @ 8116848
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
@ -47447,7 +47447,7 @@ sub_8116848: @ 8116848
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_8116848 thumb_func_end AnimTask_BlendParticle
thumb_func_start sub_8116874 thumb_func_start sub_8116874
sub_8116874: @ 8116874 sub_8116874: @ 8116874

6
asm/battle_anim_815A0D4.s
View File

@ -10048,8 +10048,8 @@ _0815F1DE:
.pool .pool
thumb_func_end sub_815F18C thumb_func_end sub_815F18C
thumb_func_start sub_815F20C thumb_func_start AnimTask_MonToSubstitute
sub_815F20C: @ 815F20C AnimTask_MonToSubstitute: @ 815F20C
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r9 mov r7, r9
mov r6, r8 mov r6, r8
@ -10183,7 +10183,7 @@ _0815F310:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_815F20C thumb_func_end AnimTask_MonToSubstitute
thumb_func_start sub_815F330 thumb_func_start sub_815F330
sub_815F330: @ 815F330 sub_815F330: @ 815F330

2
data/battle_anim_80FE840.s
View File

@ -3782,7 +3782,7 @@ gSimplePaletteBlendSpriteTemplate:: @ 8597274
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81157FC spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81157FC
.align 2 .align 2
gBattleAnimSpriteTemplate_859728C:: @ 859728C gComplexPaletteBlendSpriteTemplate:: @ 859728C
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81158A4 spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81158A4
.align 2 .align 2

1179
data/battle_anim_scripts.s
View File

File diff suppressed because it is too large Load Diff

11
src/intro.c
View File

@ -25,6 +25,7 @@
#include "blend_palette.h" #include "blend_palette.h"
#include "title_screen.h" #include "title_screen.h"
#include "constants/rgb.h" #include "constants/rgb.h"
#include "constants/battle_anim.h"
extern const struct CompressedSpriteSheet gBattleAnimPicTable[]; extern const struct CompressedSpriteSheet gBattleAnimPicTable[];
extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; extern const struct CompressedSpritePalette gBattleAnimPaletteTable[];
@ -1531,8 +1532,6 @@ static void Task_IntroWaitToSetupPart3LegendsFight(u8 taskId)
static void Task_IntroLoadPart1Graphics3(u8 taskId) static void Task_IntroLoadPart1Graphics3(u8 taskId)
{ {
u16 i;
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
intro_reset_and_hide_bgs(); intro_reset_and_hide_bgs();
@ -1543,8 +1542,8 @@ static void Task_IntroLoadPart1Graphics3(u8 taskId)
LZDecompressVram(gIntro3GroudonTilemap, (void *)(VRAM + 0xC000)); LZDecompressVram(gIntro3GroudonTilemap, (void *)(VRAM + 0xC000));
LZDecompressVram(gIntro3LegendBgGfx, (void *)(VRAM + 0x4000)); LZDecompressVram(gIntro3LegendBgGfx, (void *)(VRAM + 0x4000));
LZDecompressVram(gIntro3GroudonBgTilemap, (void *)(VRAM + 0xE000)); LZDecompressVram(gIntro3GroudonBgTilemap, (void *)(VRAM + 0xE000));
LoadCompressedObjectPicUsingHeap(&gBattleAnimPicTable[0x3A]); LoadCompressedObjectPicUsingHeap(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_058)]);
LoadCompressedObjectPaletteUsingHeap(&gBattleAnimPaletteTable[0x3A]); LoadCompressedObjectPaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_058)]);
CpuCopy16(gIntro3BgPal, gPlttBufferUnfaded, sizeof(gIntro3BgPal)); CpuCopy16(gIntro3BgPal, gPlttBufferUnfaded, sizeof(gIntro3BgPal));
gTasks[taskId].func = Task_IntroLoadPart1Graphics4; gTasks[taskId].func = Task_IntroLoadPart1Graphics4;
} }
@ -1584,12 +1583,10 @@ static void Task_IntroLoadPart1Graphics4(u8 taskId)
static void Task_IntroLoadPart1Graphics5(u8 taskId) static void Task_IntroLoadPart1Graphics5(u8 taskId)
{ {
u16 foo = gTasks[taskId].data[0];
if (gTasks[taskId].data[0] != 32) if (gTasks[taskId].data[0] != 32)
{ {
gTasks[taskId].data[0] += 4; gTasks[taskId].data[0] += 4;
SetGpuReg(REG_OFFSET_WIN0V, (gTasks[taskId].data[0] * 256) - (foo -= 0x9C)); SetGpuReg(REG_OFFSET_WIN0V, (gTasks[taskId].data[0] * 256) - (gTasks[taskId].data[0] - 160));
} }
else else
{ {