Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-26 00:32:20 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Move PokemonSpriteManager to pokemon sprite struct def header

Browse Source
This commit is contained in:
RavePossum 2025-02-17 14:22:14 -05:00
parent 7c6bfa45df
commit 67ec27b77e
38 changed files with 27 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/battle/ov16_0223DF00.h
View File

@ -7,7 +7,6 @@
#include "struct_decls/pc_boxes_decl.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/pokemon_animation_sys_decl.h"
#include "struct_decls/struct_02007768_decl.h"
#include "struct_decls/struct_0200C440_decl.h"
#include "struct_defs/chatot_cry.h"
#include "struct_defs/pokemon_sprite.h"

1
include/overlay017/struct_ov17_0223F88C.h
View File

@ -1,7 +1,6 @@
#ifndef POKEPLATINUM_STRUCT_OV17_0223F88C_H
#define POKEPLATINUM_STRUCT_OV17_0223F88C_H
#include "struct_decls/struct_02007768_decl.h"
#include "struct_decls/struct_02012744_decl.h"
#include "struct_defs/pokemon_sprite.h"
#include "struct_defs/struct_02095C48_sub1.h"

1
include/overlay017/struct_ov17_022476F8.h
View File

@ -1,7 +1,6 @@
#ifndef POKEPLATINUM_STRUCT_OV17_022476F8_H
#define POKEPLATINUM_STRUCT_OV17_022476F8_H
#include "struct_decls/struct_02007768_decl.h"
#include "struct_defs/pokemon_sprite.h"
#include "struct_defs/struct_02095C48_sub1.h"

1
include/overlay017/struct_ov17_0224A1EC.h
View File

@ -1,7 +1,6 @@
#ifndef POKEPLATINUM_STRUCT_OV17_0224A1EC_H
#define POKEPLATINUM_STRUCT_OV17_0224A1EC_H
#include "struct_decls/struct_02007768_decl.h"
#include "struct_decls/struct_02012744_decl.h"
#include "struct_defs/pokemon_sprite.h"
#include "struct_defs/struct_02095C48_sub1.h"

1
include/overlay017/struct_ov17_022507C4.h
View File

@ -1,7 +1,6 @@
#ifndef POKEPLATINUM_STRUCT_OV17_022507C4_H
#define POKEPLATINUM_STRUCT_OV17_022507C4_H
#include "struct_decls/struct_02007768_decl.h"
#include "struct_decls/struct_02012744_decl.h"
#include "struct_defs/pokemon_sprite.h"
#include "struct_defs/struct_02095C48_sub1.h"

2
include/overlay019/ov19_021D61B0.h
View File

@ -3,8 +3,6 @@
#include <nnsys.h>
#include "struct_decls/struct_02007768_decl.h"
#include "overlay019/funcptr_ov19_021D79B8.h"
#include "overlay019/struct_ov19_021D4DF0.h"
#include "overlay019/struct_ov19_021D5DF8_decl.h"

1
include/overlay019/struct_ov19_021DA9E0.h
View File

@ -3,7 +3,6 @@
#include <nnsys.h>
#include "struct_decls/struct_02007768_decl.h"
#include "struct_decls/struct_0200C440_decl.h"
#include "struct_defs/pokemon_sprite.h"

1
include/overlay021/pokedex_graphic_data.h
View File

@ -1,7 +1,6 @@
#ifndef POKEPLATINUM_POKEDEX_GRAPHIC_DATA_H
#define POKEPLATINUM_POKEDEX_GRAPHIC_DATA_H
#include "struct_decls/struct_02007768_decl.h"
#include "struct_decls/struct_02015064_decl.h"
#include "struct_defs/pokemon_sprite.h"

2
include/overlay021/struct_ov21_021E8E0C.h
View File

@ -1,8 +1,6 @@
#ifndef POKEPLATINUM_STRUCT_OV21_021E8E0C_H
#define POKEPLATINUM_STRUCT_OV21_021E8E0C_H
#include "struct_decls/struct_02007768_decl.h"
#include "bg_window.h"
#include "palette.h"
#include "pokemon.h"

1
include/overlay022/ov22_02259098.h
View File

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

1
include/overlay022/struct_ov22_02257964_sub2.h
View File

@ -1,7 +1,6 @@
#ifndef POKEPLATINUM_STRUCT_OV22_02257964_SUB2_H
#define POKEPLATINUM_STRUCT_OV22_02257964_SUB2_H
#include "struct_decls/struct_02007768_decl.h"
#include "struct_decls/struct_02015064_decl.h"
#include "struct_decls/struct_02015128_decl.h"
#include "struct_decls/struct_020151A4_decl.h"

2
include/overlay022/struct_ov22_0225A0E4.h
View File

@ -3,10 +3,10 @@
#include <nnsys.h>
#include "struct_decls/struct_02007768_decl.h"
#include "struct_decls/struct_02015064_decl.h"
#include "struct_decls/struct_02015128_decl.h"
#include "struct_decls/struct_020151A4_decl.h"
#include "struct_defs/pokemon_sprite.h"
#include "bg_window.h"
#include "narc.h"

1
include/overlay022/struct_ov22_0225B388.h
View File

@ -1,7 +1,6 @@
#ifndef POKEPLATINUM_STRUCT_OV22_0225B388_H
#define POKEPLATINUM_STRUCT_OV22_0225B388_H
#include "struct_decls/struct_02007768_decl.h"
#include "struct_decls/struct_02015064_decl.h"
#include "struct_decls/struct_02015128_decl.h"
#include "struct_decls/struct_020151A4_decl.h"

2
include/overlay062/struct_ov62_0223118C.h
View File

@ -1,9 +1,9 @@
#ifndef POKEPLATINUM_STRUCT_OV62_0223118C_H
#define POKEPLATINUM_STRUCT_OV62_0223118C_H
#include "struct_decls/struct_02007768_decl.h"
#include "struct_decls/struct_02012744_decl.h"
#include "struct_decls/struct_02023FCC_decl.h"
#include "struct_defs/pokemon_sprite.h"
#include "struct_defs/struct_0207C690.h"
#include "overlay062/struct_ov62_0223118C_sub1.h"

1
include/overlay076/struct_ov76_0223C398.h
View File

@ -3,7 +3,6 @@
#include "struct_decls/font_oam.h"
#include "struct_decls/pokemon_animation_sys_decl.h"
#include "struct_decls/struct_02007768_decl.h"
#include "struct_decls/struct_02012744_decl.h"
#include "struct_decls/struct_02015920_decl.h"
#include "struct_decls/struct_02023FCC_decl.h"

1
include/overlay105/ov105_02245CD0.h
View File

@ -1,7 +1,6 @@
#ifndef POKEPLATINUM_OV105_02245CD0_H
#define POKEPLATINUM_OV105_02245CD0_H
#include "struct_decls/struct_02007768_decl.h"
#include "struct_defs/pokemon_sprite.h"
#include "pokemon.h"

1
include/overlay119/struct_ov119_021D17B8.h
View File

@ -2,7 +2,6 @@
#define POKEPLATINUM_STRUCT_OV119_021D17B8_H
#include "struct_decls/pokemon_animation_sys_decl.h"
#include "struct_decls/struct_02007768_decl.h"
#include "struct_defs/struct_0207C690.h"
#include "overlay119/struct_ov119_021D14DC.h"

6
include/struct_decls/struct_02007768_decl.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_02007768_DECL_H
#define POKEPLATINUM_STRUCT_02007768_DECL_H
typedef struct PokemonSpriteManager_t PokemonSpriteManager;
#endif // POKEPLATINUM_STRUCT_02007768_DECL_H

1
include/struct_defs/battle_system.h
View File

@ -9,7 +9,6 @@
#include "struct_decls/pc_boxes_decl.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/pokemon_animation_sys_decl.h"
#include "struct_decls/struct_02007768_decl.h"
#include "struct_decls/struct_0200C440_decl.h"
#include "struct_decls/struct_02027F8C_decl.h"
#include "struct_decls/struct_0206D140_decl.h"

25
include/struct_defs/pokemon_sprite.h
View File

@ -1,6 +1,10 @@
#ifndef POKEPLATINUM_STRUCT_POKEMON_SPRITE_H
#define POKEPLATINUM_STRUCT_POKEMON_SPRITE_H
#include <nnsys.h>
#include "constants/heap.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/sprite_animation_frame.h"
#include "struct_defs/struct_02007C7C_sub1.h"
@ -31,4 +35,25 @@ struct PokemonSprite {
SpriteAnimationFrame unk_84[10];
};
typedef struct PokemonSpriteManager {
PokemonSprite sprites[4];
NNSG2dImageProxy imageProxy;
NNSG2dImagePaletteProxy paletteProxy;
enum HeapId heapID;
u32 charBaseAddr;
u32 charSize;
u32 plttBaseAddr;
u32 plttSize;
u8 *charRawData;
u16 *plttRawData;
u16 *plttRawDataUnfaded;
NNSG2dCharacterData charData;
NNSG2dPaletteData plttData;
u8 dummy330;
u8 needLoadImage;
u8 needLoadPltt;
u8 needG3Identity;
u32 flags;
} PokemonSpriteManager;
#endif // POKEPLATINUM_STRUCT_POKEMON_SPRITE_H

31
include/struct_defs/struct_02007768.h
View File

@ -1,31 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_02007768_H
#define POKEPLATINUM_STRUCT_02007768_H
#include <nnsys.h>
#include "constants/heap.h"
#include "struct_defs/pokemon_sprite.h"
typedef struct PokemonSpriteManager_t {
PokemonSprite sprites[4];
NNSG2dImageProxy imageProxy;
NNSG2dImagePaletteProxy paletteProxy;
enum HeapId heapID;
u32 charBaseAddr;
u32 charSize;
u32 plttBaseAddr;
u32 plttSize;
u8 *charRawData;
u16 *plttRawData;
u16 *plttRawDataUnfaded;
NNSG2dCharacterData charData;
NNSG2dPaletteData plttData;
u8 dummy330;
u8 needLoadImage;
u8 needLoadPltt;
u8 needG3Identity;
u32 flags;
} PokemonSpriteManager;
#endif // POKEPLATINUM_STRUCT_02007768_H

1
include/struct_defs/struct_0207AE68_t.h
View File

@ -3,7 +3,6 @@
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/pokemon_animation_sys_decl.h"
#include "struct_decls/struct_02007768_decl.h"
#include "struct_defs/pokemon_sprite.h"
#include "struct_defs/struct_0207C690.h"
#include "struct_defs/struct_0207C8C4.h"

1
include/unk_0200762C.h
View File

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

1
include/unk_02094EDC.h
View File

@ -1,7 +1,6 @@
#ifndef POKEPLATINUM_UNK_02094EDC_H
#define POKEPLATINUM_UNK_02094EDC_H
#include "struct_decls/struct_02007768_decl.h"
#include "struct_defs/pokemon_sprite.h"
#include "struct_defs/struct_02095C48.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_decls/struct_02007768_decl.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/battle_io.h"
#include "struct_defs/pokemon_sprite.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_decls/struct_02007768_decl.h"
#include "struct_defs/archived_sprite.h"
#include "struct_defs/battle_system.h"
#include "struct_defs/fraction.h"

1
src/battle/ov16_0223DF00.c
View File

@ -14,7 +14,6 @@
#include "struct_decls/pc_boxes_decl.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/pokemon_animation_sys_decl.h"
#include "struct_decls/struct_02007768_decl.h"
#include "struct_decls/struct_0200C440_decl.h"
#include "struct_defs/battle_system.h"
#include "struct_defs/chatot_cry.h"

1
src/choose_starter/choose_starter_app.c
View File

@ -9,7 +9,6 @@
#include "constants/narc.h"
#include "constants/species.h"
#include "struct_decls/struct_02007768_decl.h"
#include "struct_decls/struct_02015064_decl.h"
#include "struct_decls/struct_02015128_decl.h"
#include "struct_decls/struct_020151A4_decl.h"

1
src/overlay019/ov19_021D61B0.c
View File

@ -3,7 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_decls/struct_02007768_decl.h"
#include "struct_defs/struct_02099F80.h"
#include "overlay019/funcptr_ov19_021D79B8.h"

1
src/overlay021/ov21_021E8D48.c
View File

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

1
src/overlay022/ov22_02259098.c
View File

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

1
src/overlay077/ov77_021D6C70.c
View File

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

1
src/overlay095/ov95_02247B6C.c
View File

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

1
src/overlay095/ov95_0224B3D8.c
View File

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

1
src/overlay105/ov105_02241AE0.c
View File

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

1
src/overlay105/ov105_02245CD0.c
View File

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

1
src/unk_0200762C.c
View File

@ -6,7 +6,6 @@
#include "struct_defs/archived_sprite.h"
#include "struct_defs/pokemon_sprite.h"
#include "struct_defs/sprite_animation_frame.h"
#include "struct_defs/struct_02007768.h"
#include "struct_defs/struct_02008900.h"
#include "heap.h"

1
src/unk_02094EDC.c
View File

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