dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port/dump data up to front_pic_coordinates.

Browse Source
This commit is contained in:
ultima-soul
2019-10-13 14:43:22 -07:00
parent 0eeaf29c64
commit 26c879be9a
7 changed files with 2319 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/data.s
+85 -12
View File
@@ -147,23 +147,96 @@ gSpriteAffineAnim_82348B0:: @ 82348B0
obj_rot_scal_anim_end
.align 2
gUnknown_82348C8:: @ 82348C8
.incbin "baserom.gba", 0x2348C8, 0x24
gSpriteAffineAnimTable_82348C8:: @ 82348C8
.4byte gSpriteAffineAnim_82347F8
.4byte gSpriteAffineAnim_8234818
.4byte gSpriteAffineAnim_8234830
.4byte gSpriteAffineAnim_8234848
.4byte gSpriteAffineAnim_8234868
.4byte gSpriteAffineAnim_8234878
.4byte gSpriteAffineAnim_82348A0
.4byte gSpriteAffineAnim_82348B0
.4byte gSpriteAffineAnim_8234888
gUnknown_82348EC:: @ 82348EC
.incbin "baserom.gba", 0x2348EC, 0x58
.align 2
gSpriteAffineAnim_82348EC:: @ 82348EC
obj_rot_scal_anim_frame 0xFFFC, 0xFFFC, 4, 63
obj_rot_scal_anim_end
gUnknown_8234944:: @ 8234944
.incbin "baserom.gba", 0x234944, 0x58
.align 2
gSpriteAffineAnim_82348FC:: @ 82348FC
obj_rot_scal_anim_frame 0x0, 0x0, 3, 5
obj_rot_scal_anim_frame 0x0, 0x0, -3, 5
obj_rot_scal_anim_end
gUnknown_823499C:: @ 823499C
.incbin "baserom.gba", 0x23499C, 0x20
.align 2
gSpriteAffineAnim_8234914:: @ 8234914
obj_rot_scal_anim_frame 0x0, 0x0, -5, 20
obj_rot_scal_anim_frame 0x0, 0x0, 0, 20
obj_rot_scal_anim_frame 0x0, 0x0, 5, 20
obj_rot_scal_anim_end
gUnknown_82349BC:: @ 82349BC
.incbin "baserom.gba", 0x2349BC, 0x10
.align 2
gSpriteAffineAnim_8234934:: @ 8234934
obj_rot_scal_anim_frame 0x0, 0x0, 9, 110
obj_rot_scal_anim_end
gMonFrontPicCoords:: @ 82349CC
.incbin "baserom.gba", 0x2349CC, 0x6E0
.align 2
gSpriteAffineAnimTable_8234944:: @ 8234944
.4byte gSpriteAffineAnim_82347F8
.4byte gSpriteAffineAnim_8234818
.4byte gSpriteAffineAnim_8234830
.4byte gSpriteAffineAnim_8234848
.4byte gSpriteAffineAnim_8234868
.4byte gSpriteAffineAnim_8234878
.4byte gSpriteAffineAnim_82348EC
.4byte gSpriteAffineAnim_82348FC
.4byte gSpriteAffineAnim_8234914
.4byte gSpriteAffineAnim_8234888
.4byte gSpriteAffineAnim_8234934
.align 2
gSpriteAffineAnimTable_82349470:: @ 82349470
.4byte gSpriteAffineAnim_8234808
.4byte gSpriteAffineAnim_8234818
.4byte gSpriteAffineAnim_8234830
.4byte gSpriteAffineAnim_8234848
.4byte gSpriteAffineAnim_8234868
.4byte gSpriteAffineAnim_8234878
.4byte gSpriteAffineAnim_82348EC
.4byte gSpriteAffineAnim_82348FC
.4byte gSpriteAffineAnim_8234914
.4byte gSpriteAffineAnim_8234888
.4byte gSpriteAffineAnim_8234934
.align 2
gSpriteAnim_823499C:: @ 823499C
obj_image_anim_frame 0, 0
obj_image_anim_end
.align 2
gSpriteAnim_82349A4:: @ 82349A4
obj_image_anim_frame 1, 0
obj_image_anim_end
.align 2
gSpriteAnim_82349AC:: @ 82349AC
obj_image_anim_frame 2, 0
obj_image_anim_end
.align 2
gSpriteAnim_82349B4:: @ 82349B4
obj_image_anim_frame 3, 0
obj_image_anim_end
.align 2
gSpriteAnimTable_82349BC:: @ 82349BC
.4byte gSpriteAnim_823499C
.4byte gSpriteAnim_82349A4
.4byte gSpriteAnim_82349AC
.4byte gSpriteAnim_82349B4
.section .rodata.82350AC
gMonFrontPicTable:: @ 82350AC
.incbin "baserom.gba", 0x2350AC, 0xE8
include/data.h
+3 -3
View File
@@ -47,9 +47,9 @@ extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
extern const struct OamData gUnknown_824F010;
extern const struct OamData gUnknown_824F018;
extern const union AnimCmd *const gUnknown_82349BC[];
extern const union AffineAnimCmd *const gUnknown_82348C8[];
extern const union AffineAnimCmd *const gUnknown_8234944[];
extern const union AnimCmd *const gSpriteAnimTable_82349BC[];
extern const union AffineAnimCmd *const gSpriteAffineAnimTable_82348C8[];
extern const union AffineAnimCmd *const gSpriteAffineAnimTable_8234944[];
extern const struct SpriteFrameImage gUnknown_8234698[];
extern const struct SpriteFrameImage gUnknown_82346B8[];
extern const struct SpriteFrameImage gUnknown_82346D8[];
ld_script.txt
+2
View File
@@ -383,6 +383,8 @@ SECTIONS {
src/link.o(.rodata);
src/main_menu.o(.rodata);
data/data.o(.rodata);
src/data.o(.rodata);
data/data.o(.rodata.82350AC);
src/battle_util.o(.rodata);
src/battle_script_commands.o(.rodata);
src/battle_controller_player.o(.rodata);
src/data.c
+12
View File
@@ -0,0 +1,12 @@
#include "global.h"
#include "malloc.h"
#include "battle.h"
#include "data.h"
#include "graphics.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "constants/battle_ai.h"
#include "data/pokemon_graphics/front_pic_coordinates.h"
src/data/pokemon_graphics/front_pic_coordinates.h
+2203
View File
File diff suppressed because it is too large Load Diff
src/pokemon.c
+12 -12
View File
@@ -1470,7 +1470,7 @@ const struct SpriteTemplate gUnknown_825DEF0[] =
.oam = &gUnknown_824F018,
.anims = NULL,
.images = gUnknown_8234698,
.affineAnims = gUnknown_82348C8,
.affineAnims = gSpriteAffineAnimTable_82348C8,
.callback = sub_80120C4,
},
{
@@ -1479,7 +1479,7 @@ const struct SpriteTemplate gUnknown_825DEF0[] =
.oam = &gUnknown_824F010,
.anims = NULL,
.images = gUnknown_82346B8,
.affineAnims = gUnknown_8234944,
.affineAnims = gSpriteAffineAnimTable_8234944,
.callback = oac_poke_opponent,
},
{
@@ -1488,7 +1488,7 @@ const struct SpriteTemplate gUnknown_825DEF0[] =
.oam = &gUnknown_824F018,
.anims = NULL,
.images = gUnknown_82346D8,
.affineAnims = gUnknown_82348C8,
.affineAnims = gSpriteAffineAnimTable_82348C8,
.callback = sub_80120C4,
},
{
@@ -1497,7 +1497,7 @@ const struct SpriteTemplate gUnknown_825DEF0[] =
.oam = &gUnknown_824F010,
.anims = NULL,
.images = gUnknown_82346F8,
.affineAnims = gUnknown_8234944,
.affineAnims = gSpriteAffineAnimTable_8234944,
.callback = oac_poke_opponent,
},
};
@@ -1510,7 +1510,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
.oam = &gUnknown_824F018,
.anims = NULL,
.images = gUnknown_8234718,
.affineAnims = gUnknown_82348C8,
.affineAnims = gSpriteAffineAnimTable_82348C8,
.callback = sub_80120C4,
},
{
@@ -1519,7 +1519,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
.oam = &gUnknown_824F018,
.anims = NULL,
.images = gUnknown_8234740,
.affineAnims = gUnknown_82348C8,
.affineAnims = gSpriteAffineAnimTable_82348C8,
.callback = sub_80120C4,
},
{
@@ -1528,7 +1528,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
.oam = &gUnknown_824F018,
.anims = NULL,
.images = gUnknown_82347A8,
.affineAnims = gUnknown_82348C8,
.affineAnims = gSpriteAffineAnimTable_82348C8,
.callback = sub_80120C4,
},
{
@@ -1537,7 +1537,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
.oam = &gUnknown_824F018,
.anims = NULL,
.images = gUnknown_82347C8,
.affineAnims = gUnknown_82348C8,
.affineAnims = gSpriteAffineAnimTable_82348C8,
.callback = sub_80120C4,
},
{
@@ -1546,7 +1546,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
.oam = &gUnknown_824F018,
.anims = NULL,
.images = gUnknown_8234768,
.affineAnims = gUnknown_82348C8,
.affineAnims = gSpriteAffineAnimTable_82348C8,
.callback = sub_80120C4,
},
{
@@ -1555,7 +1555,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
.oam = &gUnknown_824F018,
.anims = NULL,
.images = gUnknown_8234788,
.affineAnims = gUnknown_82348C8,
.affineAnims = gSpriteAffineAnimTable_82348C8,
.callback = sub_80120C4,
},
};
@@ -2698,7 +2698,7 @@ void SetMultiuseSpriteTemplateToPokemon(u16 speciesTag, u8 battlerPosition)
}
}
gMultiuseSpriteTemplate.paletteTag = speciesTag;
gMultiuseSpriteTemplate.anims = gUnknown_82349BC;
gMultiuseSpriteTemplate.anims = gSpriteAnimTable_82349BC;
}
void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosition)
@@ -6089,7 +6089,7 @@ static void OakSpeechNidoranFSetupTemplateDummy(struct OakSpeechNidoranFStruct *
for (j = 0; j < structPtr->frameCount; ++j)
structPtr->frameImages[i * structPtr->spriteCount + j].data = &structPtr->bufferPtrs[i][j * 0x800];
structPtr->templates[i].images = &structPtr->frameImages[i * structPtr->spriteCount]; // should be frameCount logically
structPtr->templates[i].anims = gUnknown_82349BC;
structPtr->templates[i].anims = gSpriteAnimTable_82349BC;
structPtr->templates[i].paletteTag = i;
}
}
src/trainer_pokemon_sprites.c
+2 -2
View File
@@ -14,7 +14,7 @@ extern const struct CompressedSpriteSheet gMonBackPicTable[];
extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const union AnimCmd *const gUnknown_82349BC[];
extern const union AnimCmd *const gSpriteAnimTable_82349BC[];
extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
// Static type declarations
@@ -138,7 +138,7 @@ void LoadPicPaletteBySlot(u16 species, u32 otId, u32 personality, u8 paletteSlot
void AssignSpriteAnimsTable(bool8 isTrainer)
{
if (!isTrainer)
sCreatingSpriteTemplate.anims = gUnknown_82349BC;
sCreatingSpriteTemplate.anims = gSpriteAnimTable_82349BC;
else
sCreatingSpriteTemplate.anims = gTrainerFrontAnimsPtrTable[0];
}