mirror of
https://github.com/pret/pmd-red.git
synced 2026-09-12 02:56:01 -05:00
Merge branch 'master' of https://github.com/pret/pmd-red
This commit is contained in:
@@ -47,7 +47,7 @@ void SendEyesightEndMessage(struct DungeonEntity * pokemon,struct DungeonEntity
|
||||
void SendMuzzledEndMessage(struct DungeonEntity * pokemon, struct DungeonEntity * target);
|
||||
void sub_807A96C(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
void sub_807A9B0(struct DungeonEntity * pokemon);
|
||||
void sub_807A9D8(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
void SendThawedMessage(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
void sub_807AA30(void);
|
||||
|
||||
#endif // !GUARD_CODE_8077274_1_H
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
#define COLOR_GREEN 4
|
||||
#define COLOR_CYAN 5
|
||||
#define COLOR_YELLOW 6
|
||||
#define COLOR_WHITE_2 7
|
||||
|
||||
#endif //GUARD_CONSTANTS_COLORS_H
|
||||
|
||||
@@ -205,6 +205,7 @@
|
||||
#define SPECIES_SLOWKING 199
|
||||
#define SPECIES_MISDREAVUS 200
|
||||
#define SPECIES_UNOWN 201
|
||||
#define SPECIES_UNOWN_A 201
|
||||
#define SPECIES_UNOWN_B 202
|
||||
#define SPECIES_UNOWN_C 203
|
||||
#define SPECIES_UNOWN_D 204
|
||||
|
||||
@@ -10,7 +10,7 @@ struct DebugLocation
|
||||
char *func;
|
||||
};
|
||||
|
||||
void Log(u8 *buffer, const char *text, ...);
|
||||
void Log(u8 num, const char *text, ...);
|
||||
void NDS_DebugInit(void);
|
||||
void nullsub_25(void);
|
||||
void nullsub_26(void);
|
||||
|
||||
@@ -213,7 +213,8 @@ struct DungeonEntityData
|
||||
/* 0x16C */ struct Position targetPosition;
|
||||
/* 0x170 */ struct Position posPixel;
|
||||
u32 unk174;
|
||||
u8 fill178[0x184 - 0x178];
|
||||
u8 fill178[0x17A - 0x178];
|
||||
/* 0x17A */ u16 mimicMoveIDs[MAX_MON_MOVES]; // All moves that Mimic has copied (not sure on size...)
|
||||
// Previous value of targetPosition for movement, 1 and 2 moves ago.
|
||||
/* 0x184 */ struct Position previousTargetMovePosition1;
|
||||
/* 0x188 */ struct Position32 previousTargetMovePosition2;
|
||||
|
||||
@@ -50,12 +50,14 @@ struct DungeonGlobalData
|
||||
u8 fill646[0x65C - 0x646];
|
||||
u8 unk65C;
|
||||
u8 fill65D[0x660 - 0x65D];
|
||||
/* 0x660 */ u16 speedTurnCounter; // Handles turn order when Pokémon have different movement speeds.
|
||||
/* 0x660 */ s16 speedTurnCounter; // Handles turn order when Pokémon have different movement speeds.
|
||||
u8 fill662[0x666 - 0x662];
|
||||
/* 0x666 */ u16 turnsLeft; // Turns remaining before getting swept out of the dungeon.
|
||||
u8 fill668[0x66A - 0x668];
|
||||
u16 unk66A;
|
||||
u8 fill66C[0x671 - 0x66C];
|
||||
u8 fill66C[0x66E - 0x66C];
|
||||
/* 0x66E */ u8 unk66E;
|
||||
u8 fill66F[0x671 - 0x66F];
|
||||
/* 0x671 */ bool8 monsterHouseActive;
|
||||
/* 0x672 */ u8 unk672;
|
||||
u8 fill673[0x674 - 0x673];
|
||||
|
||||
@@ -3,7 +3,17 @@
|
||||
|
||||
#include "dungeon_entity.h"
|
||||
|
||||
bool8 IsMovingClient(struct DungeonEntity *entity);
|
||||
struct DungeonEntity *GetEntityFromClientType(u8 entityType);
|
||||
void sub_80856C8(struct DungeonEntity * pokemon, s32 x, s32 y);
|
||||
void sub_80856E0(struct DungeonEntity * pokemon, s32 direction);
|
||||
void sub_8085764(void);
|
||||
void sub_8085860(s32 x, s32 y);
|
||||
void sub_8085890(s32 x, s32 y);
|
||||
void ShiftCameraToPosition(struct Position32 *posStruct, s32 cameraSteps);
|
||||
void SetFacingDirection(struct DungeonEntity *pokemon, s32 direction);
|
||||
void sub_8085930(s32 direction);
|
||||
void sub_80859F0(s32 direction);
|
||||
bool8 IsMovingClient(struct DungeonEntity *entity);
|
||||
void sub_8085B0C(struct DungeonEntity *pokemon);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -7,7 +7,6 @@ struct UnkEventStruct
|
||||
/* 0x4 */ u32 *unk4;
|
||||
};
|
||||
|
||||
|
||||
bool8 sub_80026CC(s16 r0);
|
||||
void sub_80026E8(s16 r0);
|
||||
bool8 sub_8002700(void *r0);
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
struct MenuItem
|
||||
{
|
||||
const char *text;
|
||||
const u8 *text;
|
||||
u32 menuAction; // action??
|
||||
};
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ s32 GetPtsToNextRank(void);
|
||||
void SetTeamRankPoints(s32 newPts);
|
||||
void AddToTeamRankPts(s32 newPts);
|
||||
u8 GetRescueTeamRank(void);
|
||||
const char *GetTeamRankString(u8 index);
|
||||
const u8 *GetTeamRankString(u8 index);
|
||||
u8 sub_80921B8(void);
|
||||
u32 SaveRescueTeamInfo(u8 *param_1,u32 param_2);
|
||||
u32 ReadRescueTeamInfo(u8 *param_1, u32 param_2);
|
||||
|
||||
@@ -4,6 +4,54 @@
|
||||
#include "constants/move.h"
|
||||
#include "dungeon_entity.h"
|
||||
|
||||
bool8 sub_805B668(struct DungeonEntity *pokemon, struct DungeonEntity *target, struct PokemonMove *move, s32 param_4);
|
||||
bool8 sub_805B734(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 RecycleMoveAction(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 sub_805B7FC(struct DungeonEntity *pokemon, struct DungeonEntity *target, struct PokemonMove *move, s32 param_4);
|
||||
bool8 sub_805B808(struct DungeonEntity *pokemon, struct DungeonEntity *target, struct PokemonMove *move, s32 param_4);
|
||||
bool8 sub_805B884(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 SkullBashMoveAction(struct DungeonEntity *pokemon, struct DungeonEntity *target, struct PokemonMove *move, s32 param_4);
|
||||
bool8 sub_805B910(struct DungeonEntity *pokemon, struct DungeonEntity *target, struct PokemonMove *move, s32 param_4);
|
||||
bool8 sub_805B968(struct DungeonEntity *pokemon, struct DungeonEntity *target, struct PokemonMove *move, s32 param_4);
|
||||
bool8 RockSmashMoveAction(struct DungeonEntity *pokemon, struct DungeonEntity *target, struct PokemonMove *move, s32 param_4);
|
||||
bool8 sub_805BA44(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 sub_805BA50(struct DungeonEntity *pokemon, struct DungeonEntity *target, struct PokemonMove *move, s32 param_4);
|
||||
bool8 sub_805BB64(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 sub_805BB74(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 sub_805BB98(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 CleanseOrbAction(struct DungeonEntity *pokemon,struct DungeonEntity *target);
|
||||
bool8 sub_805BC70(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 sub_805BC98(struct DungeonEntity *pokemon, struct DungeonEntity *target, struct PokemonMove *move, s32 param_4);
|
||||
bool8 SilenceOrbAction(struct DungeonEntity *pokemon,struct DungeonEntity *target);
|
||||
bool8 sub_805BD70(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 sub_805BD7C(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 TransferOrbAction(struct DungeonEntity *pokemon,struct DungeonEntity *target);
|
||||
bool8 sub_805BE90(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 LuminousOrbAction(struct DungeonEntity *pokemon,struct DungeonEntity *target);
|
||||
bool8 sub_805BEAC(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 sub_805BEB8(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 sub_805BEC8(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 EscapeOrbAction(struct DungeonEntity *pokemon,struct DungeonEntity *target);
|
||||
bool8 sub_805BF34(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 TrapbustOrbAction(struct DungeonEntity *pokemon,struct DungeonEntity *target);
|
||||
bool8 sub_805C080(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 sub_805C128(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 sub_805C138(struct DungeonEntity *pokemon, struct DungeonEntity *target, struct PokemonMove *move, s32 param_4);
|
||||
bool8 sub_805C1B0(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
u32 sub_805C1BC(struct DungeonEntity *pokemon, struct DungeonEntity *target, struct PokemonMove *move, s32 param_4);
|
||||
bool8 sub_805C1E4(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 sub_805C1F8(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 sub_805C208(struct DungeonEntity *pokemon, struct DungeonEntity *target, struct PokemonMove *move, u32 param_4);
|
||||
bool8 sub_805C288(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 sub_805C2A0(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 FillInOrbAction(struct DungeonEntity *pokemon,struct DungeonEntity *target);
|
||||
bool8 sub_805C3DC(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 sub_805C3F8(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 sub_805C45C(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 sub_805C468(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 sub_805C474(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 sub_805C480(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 sub_805C48C(struct DungeonEntity *pokemon, struct DungeonEntity *target);
|
||||
bool8 CanUseOnSelfWithStatusChecker(struct DungeonEntity *pokemon, struct PokemonMove *move);
|
||||
bool8 CanUseOnTargetWithStatusChecker(struct DungeonEntity *user, struct DungeonEntity *target, struct PokemonMove *move);
|
||||
bool8 HasDisabledMove(struct PokemonMove *moves);
|
||||
|
||||
Reference in New Issue
Block a user