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

Remove CopyCyanMonsterNametoBuffer fake extern

Browse Source
This commit is contained in:
DizzyEggg 2025-05-28 23:13:17 +02:00
parent d43c5de00e
commit a638b19ee5
15 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/pokemon.h
View File

@ -40,6 +40,7 @@ void InitializeRecruitedPokemon(void);
u8 GetBodySize(s32 index);
void CopyMonsterNameToBuffer(u8 * buffer, s32 index);
void CopyYellowMonsterNametoBuffer(u8 *buffer, s16 index);
void CopyCyanMonsterNametoBuffer(u8 *buffer, s32 index_);
void PrintColoredPokeNameToBuffer(u8 *buffer, PokemonStruct1 *pokemon, s32 colorNum);
void sub_808D930(u8 *buffer, s32 index);
void sub_808D9DC(u8 *buffer, PokemonStruct2 *, s32 colorNum);

10
include/pokemon_mid.h
View File

@ -1,10 +0,0 @@
#ifndef GUARD_POKEMON_MID_H
#define GUARD_POKEMON_MID_H
#include "pokemon.h"
// NOTE: this is kept separate since TransferOrbAction needs index to be s32
// and I haven't had the time to fix matching
void CopyCyanMonsterNametoBuffer(u8 *buffer, s16 index);
#endif // GUARD_POKEMON_MID_H

1
src/code_806FDF4.c
View File

@ -18,7 +18,6 @@
#include "friend_area.h"
#include "pokemon.h"
#include "pokemon_3.h"
#include "pokemon_mid.h"
#include "position_util.h"
#include "text_util.h"
#include "dungeon_util_1.h"

1
src/code_80718D8.c
View File

@ -21,7 +21,6 @@
#include "code_803E668.h"
#include "code_806CD90.h"
#include "moves.h"
#include "pokemon_mid.h"
#include "structs/dungeon_entity.h"
#include "structs/map.h"
#include "structs/str_pokemon.h"

1
src/code_8077274_1.c
View File

@ -19,7 +19,6 @@
#include "math.h"
#include "pokemon.h"
#include "pokemon_3.h"
#include "pokemon_mid.h"
#include "structs/dungeon_entity.h"
#include "structs/str_dungeon.h"
#include "dungeon_map_access.h"

1
src/code_809A560.c
View File

@ -25,7 +25,6 @@
#include "memory.h"
#include "personality_test1.h"
#include "pokemon.h"
#include "pokemon_mid.h"
#include "string_format.h"
#include "text_1.h"
#include "text_2.h"

1
src/dungeon.c
View File

@ -8,7 +8,6 @@
#include "items.h"
#include "moves.h"
#include "pokemon.h"
#include "pokemon_mid.h"
#include "random.h"
#include "string_format.h"
#include "strings.h"

1
src/dungeon_jobs.c
View File

@ -10,7 +10,6 @@
#include "string_format.h"
#include "code_80958E8.h"
#include "mailbox.h"
#include "pokemon_mid.h"
#include "structs/str_dungeon.h"
#include "constants/dungeon.h"

1
src/dungeon_logic.c
View File

@ -22,7 +22,6 @@
#include "dungeon_move_util.h"
#include "code_800D090.h"
#include "dungeon_message.h"
#include "pokemon_mid.h"
#include "dungeon_strings.h"
#include "constants/move_id.h"
#include "moves.h"

3
src/move_orb_actions_4.c
View File

@ -54,9 +54,6 @@ extern void DealDamageToEntity(Entity *, s32, u32, u32);
extern u32 gUnknown_8106A50;
extern u32 gUnknown_8106A4C;
// TODO The parameters don't match the function definition in pokemon_mid.h (u8*, s16).
extern void CopyCyanMonsterNametoBuffer(u8 *buffer, s32 index);
bool8 ProtectMoveAction(Entity * pokemon,Entity * target,Move *move, s32 param_4)
{
ProtectStatusTarget(pokemon, target);

1
src/move_orb_effects_2.c
View File

@ -24,7 +24,6 @@
#include "dungeon_strings.h"
#include "dungeon_random.h"
#include "dungeon_misc.h"
#include "pokemon_mid.h"
extern u32 gUnknown_8106A4C;

1
src/move_orb_effects_3.c
View File

@ -20,7 +20,6 @@
#include "math.h"
#include "pokemon.h"
#include "pokemon_3.h"
#include "pokemon_mid.h"
#include "structs/dungeon_entity.h"
#include "structs/str_dungeon.h"
#include "dungeon_map_access.h"

1
src/move_orb_effects_4.c
View File

@ -20,7 +20,6 @@
#include "math.h"
#include "pokemon.h"
#include "pokemon_3.h"
#include "pokemon_mid.h"
#include "structs/dungeon_entity.h"
#include "structs/str_dungeon.h"
#include "dungeon_map_access.h"

1
src/move_orb_effects_5.c
View File

@ -19,7 +19,6 @@
#include "math.h"
#include "pokemon.h"
#include "pokemon_3.h"
#include "pokemon_mid.h"
#include "structs/dungeon_entity.h"
#include "structs/str_dungeon.h"
#include "dungeon_map_access.h"

8
src/pokemon.c
View File

@ -656,10 +656,10 @@ void CopyYellowMonsterNametoBuffer(u8 *buffer, s16 index)
sprintfStatic(buffer, gUnknown_8107600, gMonsterParameters[new_index].species); // {color YELLOW}%s{reset}
}
void CopyCyanMonsterNametoBuffer(u8 *buffer, s16 index)
void CopyCyanMonsterNametoBuffer(u8 *buffer, s32 index_)
{
s32 new_index = index;
sprintfStatic(buffer, gUnknown_8107608, gMonsterParameters[new_index].species); // {color CYAN}%s{reset}
s32 index = (s16) index_;
sprintfStatic(buffer, gUnknown_8107608, gMonsterParameters[index].species); // {color CYAN}%s{reset}
}
void sub_808D930(u8 *buffer, s32 index)
@ -1132,7 +1132,7 @@ bool8 CanMonLearnMove(u16 moveID, s16 _species)
{
u16 levelUpMoveID;
u16 HMTMMoveID;
s32 species = _species; // r4
s32 species = _species;
const u8* learnsetPtr;
if (species == MONSTER_DECOY) return 0;