Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-08-24 10:25:37 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Move PokemonSpriteTemplate to pokemon sprite struct def header

Browse Source
This commit is contained in:
RavePossum
2025-02-17 14:35:35 -05:00
parent 67ec27b77e
commit fa983cf03b
48 changed files with 12 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/battle/struct_ov16_0225EA80.h
View File

@@ -2,7 +2,6 @@
#define POKEPLATINUM_STRUCT_OV16_0225EA80_H
#include "struct_decls/battle_system.h"
#include "struct_defs/archived_sprite.h"
#include "battle/struct_ov16_0225BFFC_decl.h"
#include "battle/struct_ov16_02265BBC.h"

2
include/overlay006/ov6_022426AC.h
View File

@@ -1,7 +1,7 @@
#ifndef POKEPLATINUM_OV6_022426AC_H
#define POKEPLATINUM_OV6_022426AC_H
#include "struct_defs/archived_sprite.h"
#include "struct_defs/pokemon_sprite.h"
#include "sprite.h"
#include "sprite_resource.h"

2
include/overlay022/ov22_022578F4.h
View File

@@ -4,8 +4,6 @@
#include <nitro/gx.h>
#include <nnsys.h>
#include "struct_defs/archived_sprite.h"
#include "overlay022/struct_ov22_02257964.h"
#include "overlay022/struct_ov22_02259560.h"
#include "overlay022/struct_ov22_0225B388.h"

1
include/overlay022/ov22_02259098.h
View File

@@ -3,7 +3,6 @@
#include <nnsys.h>
#include "struct_defs/archived_sprite.h"
#include "struct_defs/struct_020298D8.h"
#include "overlay022/struct_ov22_022596B0.h"

1
include/overlay079/struct_ov79_021D3820.h
View File

@@ -1,7 +1,6 @@
#ifndef POKEPLATINUM_STRUCT_OV79_021D3820_H
#define POKEPLATINUM_STRUCT_OV79_021D3820_H
#include "struct_defs/archived_sprite.h"
#include "struct_defs/pokemon_sprite.h"
#include "camera.h"

1
include/pokemon.h
View File

@@ -8,7 +8,6 @@
#include "struct_decls/pokemon_animation_sys_decl.h"
#include "struct_decls/struct_02078B40_decl.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/chatot_cry.h"
#include "struct_defs/pokemon.h"
#include "struct_defs/pokemon_sprite.h"

15
include/struct_defs/archived_sprite.h
View File

@@ -1,15 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_POKEMON_SPRITE_TEMPLATE_H
#define POKEPLATINUM_STRUCT_POKEMON_SPRITE_TEMPLATE_H
typedef struct PokemonSpriteTemplate {
u16 archive; //< ID of the sprite archive
u16 character; //< File index to pull from the archive for the character data (tiles)
u16 palette; //< File index to pull from the archive for the palette data
u16 spindaSpots; //< Simple flag denoting whether the rendered sprite should be pseudo-randomized with splotches (only for Spinda's front-sprite).
u8 dummy; //< Dummy value; never used or set to anything other than 0.
u32 personality; //< Cached personality value for Pokemon front-sprites. Specifically used for Spinda spots.
} PokemonSpriteTemplate;
#endif // POKEPLATINUM_STRUCT_POKEMON_SPRITE_TEMPLATE_H

12
include/struct_defs/pokemon_sprite.h
View File

@@ -5,7 +5,6 @@
#include "constants/heap.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/sprite_animation_frame.h"
#include "struct_defs/struct_02007C7C_sub1.h"
#include "struct_defs/struct_02007C7C_sub2.h"
@@ -14,6 +13,17 @@ typedef struct PokemonSprite PokemonSprite;
typedef void(UnkFuncPtr_02007C34)(PokemonSprite *, UnkStruct_02007C7C_sub1 *);
typedef struct PokemonSpriteTemplate {
u16 archive; //< ID of the sprite archive
u16 character; //< File index to pull from the archive for the character data (tiles)
u16 palette; //< File index to pull from the archive for the palette data
u16 spindaSpots; //< Simple flag denoting whether the rendered sprite should be pseudo-randomized with splotches (only for Spinda's front-sprite).
u8 dummy; //< Dummy value; never used or set to anything other than 0.
u32 personality; //< Cached personality value for Pokemon front-sprites. Specifically used for Spinda spots.
} PokemonSpriteTemplate;
struct PokemonSprite {
u32 unk_00_0 : 1;
u32 unk_00_1 : 6;

1
include/struct_defs/struct_02095E80_t.h
View File

@@ -7,7 +7,6 @@
#include "struct_decls/struct_02027F8C_decl.h"
#include "struct_decls/struct_0202B370_decl.h"
#include "struct_decls/struct_02095E80_decl.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/chatot_cry.h"
#include "struct_defs/struct_02027F8C.h"
#include "struct_defs/struct_02095E80_sub1.h"

1
include/unk_0200762C.h
View File

@@ -1,7 +1,6 @@
#ifndef POKEPLATINUM_UNK_0200762C_H
#define POKEPLATINUM_UNK_0200762C_H
#include "struct_defs/archived_sprite.h"
#include "struct_defs/pokemon_sprite.h"
#include "struct_defs/sprite_animation_frame.h"
#include "struct_defs/struct_02008900.h"

2
src/applications/pokemon_summary_screen/3d_anim.c
View File

@@ -5,8 +5,6 @@
#include "constants/pokemon.h"
#include "struct_defs/archived_sprite.h"
#include "applications/pokemon_summary_screen/main.h"
#include "applications/pokemon_summary_screen/sprites.h"
#include "overlay115/camera_angle.h"

1
src/battle/battle_display.c
View File

@@ -7,7 +7,6 @@
#include "constants/species.h"
#include "struct_decls/battle_system.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/battle_io.h"
#include "struct_defs/pokemon_sprite.h"
#include "struct_defs/sprite_animation_frame.h"

1
src/battle/battle_io_command.c
View File

@@ -6,7 +6,6 @@
#include "constants/battle/battle_io.h"
#include "struct_decls/battle_system.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/battle_io.h"
#include "battle/battle_display.h"

1
src/battle/battle_script.c
View File

@@ -14,7 +14,6 @@
#include "struct_decls/battle_system.h"
#include "struct_decls/pc_boxes_decl.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/battle_system.h"
#include "struct_defs/fraction.h"
#include "struct_defs/pokemon_sprite.h"

1
src/battle/ov16_0223B140.c
View File

@@ -11,7 +11,6 @@
#include "struct_decls/battle_system.h"
#include "struct_decls/struct_0207AE68_decl.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/battle_system.h"
#include "struct_defs/struct_0207A778.h"
#include "struct_defs/struct_0207C690.h"

1
src/choose_starter/choose_starter_app.c
View File

@@ -13,7 +13,6 @@
#include "struct_decls/struct_02015128_decl.h"
#include "struct_decls/struct_020151A4_decl.h"
#include "struct_decls/struct_02015214_decl.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/choose_starter_data.h"
#include "struct_defs/pokemon_sprite.h"
#include "struct_defs/struct_02099F80.h"

2
src/overlay006/ov6_022426AC.c
View File

@@ -6,8 +6,6 @@
#include "generated/gender_ratios.h"
#include "generated/genders.h"
#include "struct_defs/archived_sprite.h"
#include "heap.h"
#include "math.h"
#include "narc.h"

1
src/overlay006/ov6_02243258.c
View File

@@ -5,7 +5,6 @@
#include "struct_decls/struct_02061AB4_decl.h"
#include "struct_decls/struct_020711EC_decl.h"
#include "struct_defs/archived_sprite.h"
#include "field/field_system.h"
#include "overlay005/ov5_021F0EB0.h"

2
src/overlay012/ov12_022380BC.c
View File

@@ -3,8 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/archived_sprite.h"
#include "overlay012/const_ov12_0223B0A0.h"
#include "overlay012/const_ov12_0223B0B8.h"
#include "overlay012/const_ov12_0223B0DC.h"

2
src/overlay017/ov17_022476F8.c
View File

@@ -3,8 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/archived_sprite.h"
#include "overlay017/struct_ov17_022476F8.h"
#include "overlay017/struct_ov17_0224792C.h"
#include "overlay017/struct_ov17_02247A48.h"

2
src/overlay019/ov19_021DA92C.c
View File

@@ -3,8 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/archived_sprite.h"
#include "overlay019/ov19_021D0D80.h"
#include "overlay019/ov19_021D61B0.h"
#include "overlay019/pc_mon_preview.h"

1
src/overlay021/ov21_021D1FA4.c
View File

@@ -3,7 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/archived_sprite.h"
#include "struct_defs/pokemon_sprite.h"
#include "overlay021/ov21_021D4C0C.h"

1
src/overlay021/ov21_021E8D48.c
View File

@@ -5,7 +5,6 @@
#include "generated/text_banks.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/pokemon_sprite.h"
#include "overlay021/ov21_021D1F90.h"

1
src/overlay022/ov22_02255D44.c
View File

@@ -8,7 +8,6 @@
#include "struct_decls/struct_02015920_decl.h"
#include "struct_decls/struct_02029C68_decl.h"
#include "struct_decls/struct_02029C88_decl.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/struct_02015958.h"
#include "struct_defs/struct_0203DA00.h"
#include "struct_defs/struct_02093BBC.h"

1
src/overlay022/ov22_022578F4.c
View File

@@ -3,7 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/archived_sprite.h"
#include "struct_defs/struct_020298D8.h"
#include "overlay022/ov22_02254DE0.h"

1
src/overlay022/ov22_02259098.c
View File

@@ -3,7 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/archived_sprite.h"
#include "struct_defs/struct_020298D8.h"
#include "overlay022/ov22_02255094.h"

1
src/overlay022/ov22_0225AF8C.c
View File

@@ -7,7 +7,6 @@
#include "struct_decls/struct_02029C88_decl.h"
#include "struct_decls/struct_0202A138_decl.h"
#include "struct_decls/struct_0202A150_decl.h"
#include "struct_defs/archived_sprite.h"
#include "overlay022/ov22_02254DE0.h"
#include "overlay022/ov22_02255094.h"

1
src/overlay062/ov62_02239D60.c
View File

@@ -8,7 +8,6 @@
#include "struct_decls/pc_boxes_decl.h"
#include "struct_decls/struct_02023FCC_decl.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/pokemon_sprite.h"
#include "struct_defs/struct_02030A80.h"
#include "struct_defs/struct_0208C06C.h"

1
src/overlay073/ov73_021D0D80.c
View File

@@ -4,7 +4,6 @@
#include "constants/species.h"
#include "struct_decls/struct_02015920_decl.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/struct_02015958.h"
#include "struct_defs/struct_0208737C.h"
#include "struct_defs/struct_02099F80.h"

1
src/overlay076/ov76_0223D338.c
View File

@@ -6,7 +6,6 @@
#include "generated/trainer_score_events.h"
#include "struct_decls/font_oam.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/sprite_animation_frame.h"
#include "struct_defs/struct_02015958.h"
#include "struct_defs/struct_0202CA28.h"

1
src/overlay077/ov77_021D6C70.c
View File

@@ -4,7 +4,6 @@
#include <string.h>
#include "struct_decls/struct_02014014_decl.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/pokemon_sprite.h"
#include "camera.h"

1
src/overlay079/ov79_021D3768.c
View File

@@ -3,7 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/archived_sprite.h"
#include "struct_defs/pokemon_sprite.h"
#include "overlay079/struct_ov79_021D3820.h"

1
src/overlay086/ov86_0223B140.c
View File

@@ -3,7 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/archived_sprite.h"
#include "struct_defs/sprite_animation_frame.h"
#include "struct_defs/struct_02008900.h"
#include "struct_defs/struct_02013610.h"

1
src/overlay087/ov87_021D106C.c
View File

@@ -3,7 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/archived_sprite.h"
#include "struct_defs/struct_02013610.h"
#include "struct_defs/struct_02099F80.h"

1
src/overlay088/ov88_0223B140.c
View File

@@ -8,7 +8,6 @@
#include "struct_decls/struct_0202B370_decl.h"
#include "struct_decls/struct_02095E80_decl.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/chatot_cry.h"
#include "struct_defs/struct_02027F8C.h"
#include "struct_defs/struct_02095E80_t.h"

2
src/overlay094/ov94_0223D0C4.c
View File

@@ -4,8 +4,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/archived_sprite.h"
#include "overlay094/const_ov94_02245FD8.h"
#include "overlay094/ov94_0223BCB0.h"
#include "overlay094/ov94_0223FB48.h"

1
src/overlay095/ov95_02246C20.c
View File

@@ -3,7 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/archived_sprite.h"
#include "struct_defs/struct_02013610.h"
#include "overlay006/struct_ov6_02246254.h"

1
src/overlay095/ov95_02247B6C.c
View File

@@ -3,7 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/archived_sprite.h"
#include "struct_defs/pokemon_sprite.h"
#include "struct_defs/sprite_animation_frame.h"
#include "struct_defs/struct_02099F80.h"

1
src/overlay095/ov95_0224B3D8.c
View File

@@ -3,7 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/archived_sprite.h"
#include "struct_defs/pokemon_sprite.h"
#include "struct_defs/sprite_animation_frame.h"
#include "struct_defs/struct_02099F80.h"

1
src/overlay097/ov97_02237694.c
View File

@@ -5,7 +5,6 @@
#include "constants/species.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/struct_0202DF40.h"
#include "overlay097/struct_ov97_0222D250.h"

1
src/overlay104/ov104_02231F74.c
View File

@@ -5,7 +5,6 @@
#include "constants/narc.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/sentence.h"
#include "overlay063/ov63_0222BE18.h"

1
src/overlay105/ov105_02245CD0.c
View File

@@ -1,7 +1,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/archived_sprite.h"
#include "struct_defs/pokemon_sprite.h"
#include "gx_layers.h"

1
src/overlay119/ov119_021D0D80.c
View File

@@ -4,7 +4,6 @@
#include <string.h>
#include "struct_decls/struct_02014014_decl.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/sprite_animation_frame.h"
#include "struct_defs/struct_0207C690.h"
#include "struct_defs/struct_02099F80.h"

1
src/pokemon.c
View File

@@ -20,7 +20,6 @@
#include "struct_decls/pokemon_animation_sys_decl.h"
#include "struct_decls/struct_02023790_decl.h"
#include "struct_defs/archived_poke_sprite_data.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/chatot_cry.h"
#include "struct_defs/poke_animation_settings.h"
#include "struct_defs/pokemon_sprite.h"

1
src/render_window.c
View File

@@ -6,7 +6,6 @@
#include "constants/narc.h"
#include "generated/signpost_types.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/struct_02013610.h"
#include "graphics/signposts/field_board.naix"

1
src/unk_0200762C.c
View File

@@ -3,7 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/archived_sprite.h"
#include "struct_defs/pokemon_sprite.h"
#include "struct_defs/sprite_animation_frame.h"
#include "struct_defs/struct_02008900.h"

1
src/unk_0207AE68.c
View File

@@ -11,7 +11,6 @@
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/struct_0207AE68_decl.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/sprite_animation_frame.h"
#include "struct_defs/struct_0202818C.h"
#include "struct_defs/struct_0202CA28.h"

1
src/unk_02094EDC.c
View File

@@ -3,7 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/archived_sprite.h"
#include "struct_defs/pokemon_sprite.h"
#include "struct_defs/struct_020951B0.h"
#include "struct_defs/struct_020954F0.h"