Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-04-25 07:28:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

add more to moves header

Browse Source
This commit is contained in:
Seth Barberee 2021-12-31 16:08:12 -06:00
parent ef97af7d03
commit 3de1f79307
8 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/moves.h
View File

@ -2,18 +2,30 @@
#define GUARD_MOVES_H
#include "constants/move.h"
#include "constants/move_id.h"
// 0x92A88
void LoadWazaParameters(void);
u8 sub_809287C(struct PokemonMove *move);
void InitPokemonMove(struct PokemonMove *move, u16 moveID);
// 0x92AE0
void sub_8092AA8(struct PokemonMove *move, u16 moveID);
void InitZeroedPPPokemonMove(struct PokemonMove *move, u16 moveID);
s16 GetMoveTargetingFlags(struct PokemonMove *move, u32 isAI);
u8 GetMoveType(struct PokemonMove *move);
// 0x92B90
u8 GetMoveWeight(struct PokemonMove *move);
u8 GetMoveHitCount(struct PokemonMove *move);
s32 GetMovePower(struct PokemonMove *move);
// 0x92BF4
u8 GetMoveAccuracy(struct PokemonMove *move, u32 r1);
u32 GetMoveMaxPP(struct PokemonMove *move);
// 0x92C54
bool8 MoveDealsDirectDamage(struct PokemonMove *move);
u8 GetMoveUnk12(struct PokemonMove *move);
u8 GetMoveCriticalHitChance(struct PokemonMove *move);
u8 GetMoveCannotHitFrozen(struct PokemonMove *move);
u8 GetMoveDealsDirectDamage(struct PokemonMove *move);
u32 GetMoveRangeType(struct PokemonMove *move);
void sub_8092C84(u8 *buffer, u16 moveID);
u8 *GetMoveUseText(u16 moveID);
u8 GetMoveAffectedByMagicCoat(u16 moveID);
u8 GetMoveTargetsUser(u16 moveID);
u8 GetMoveAffectedByMuzzled(u16 moveID);
bool8 IsBlockedBySoundproof(struct PokemonMove *move);
#endif
#endif // GUARD_MOVES_H

2
src/code_2.c
View File

@ -7,6 +7,7 @@
#include "input.h"
#include "memory.h"
#include "main_menu.h"
#include "moves.h"
#include "music.h"
#include "play_time.h"
#include "save.h"
@ -23,7 +24,6 @@ extern void sub_8097670(void);
extern void LoadGameOptions(void);
extern void sub_8094C14(void);
extern void LoadItemParameters(void);
extern void LoadWazaParameters(void);
extern void sub_80950BC(void);
extern void sub_80958E8(void);
extern void sub_800CD64(u32, u32);

1
src/code_8057824.c
View File

@ -1,7 +1,6 @@
#include "global.h"
#include "dungeon_global_data.h"
#include "dungeon_entity.h"
#include "constants/move.h"
#include "moves.h"
extern u32 gUnknown_80FCF74;

2
src/friend_rescue.c
View File

@ -1,5 +1,6 @@
#include "global.h"
#include "text.h"
#include "input.h"
#include "item.h"
#include "team_inventory.h"
#include "friend_rescue.h"
@ -19,7 +20,6 @@ extern char gAvailablePokemonNames[0x50];
extern struct WonderMailStruct_203B33C *gUnknown_203B33C;
extern u8 sub_8039880(void);
void ResetUnusedInputStruct(void);
extern void sub_8035300(void);
extern void sub_8035404(u32);

8
src/items.c
View File

@ -5,7 +5,9 @@
#include "team_inventory.h"
#include "random.h"
#include "pokemon.h"
#include "random.h"
#include "subStruct_203B240.h"
#include "team_inventory.h"
#include <stddef.h>
@ -702,13 +704,13 @@ u32 sub_80913E0(struct ItemSlot* slot, u32 a2, struct subStruct_203B240 ** a3)
u8* typestring;
u32 result;
InitPokemonMove(buffer8, move);
InitPokemonMove((struct PokemonMove *)buffer8, move);
sub_80078A4(a2, 4, 82, 200, 7);
xxx_format_and_draw(4, 84, gPtrTypeText, a2, 0);
moves_data = GetMoveType(buffer8);
moves_data = GetMoveType((struct PokemonMove *)buffer8);
typestring = GetUnformattedTypeString(moves_data);
xxx_format_and_draw(64, 84, typestring, a2, 0);
result = GetMoveMaxPP(buffer8);
result = GetMoveMaxPP((struct PokemonMove *)buffer8);
gUnknown_202DE30 = result;
xxx_format_and_draw(128, 84, gPtrPPD0Text, a2, 0);
}

2
src/moves.c
View File

@ -2,7 +2,7 @@
#include "moves.h"
#include "file_system.h"
#include "constants/move_id.h"
#include "moves.h"
struct MoveDataFile
{

2
src/moves_1.c
View File

@ -1,7 +1,7 @@
#include "global.h"
#include "code_8092334.h"
#include "moves.h"
#include "pokemon.h"
#include "constants/move_id.h"
void SavePokemonMove(struct unkStruct_8094924 *r0, struct PokemonMove *move)
{

4
src/pokemon_mid.c
View File

@ -1,7 +1,8 @@
#include "global.h"
#include "pokemon.h"
#include "item.h"
#include "file_system.h"
#include "item.h"
#include "moves.h"
#include "subStruct_203B240.h"
#include "constants/colors.h"
#include "constants/move_id.h"
@ -38,7 +39,6 @@ extern void xxx_pokemon2_to_pokemonstruct_808DF44(struct PokemonStruct*, struct
extern u8* sub_8092B18(s16);
extern u8* sub_808E07C(u8* a1, u16* a2);
extern u8* sub_8092B54(s32);
extern void InitZeroedPPPokemonMove(struct PokemonMove*, u16);
extern u32 sub_8097DF0(char *, struct subStruct_203B240 **);
struct unkStruct_8107654 {