Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-09-07 08:35:47 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
DizzyEggg
2025-05-29 11:47:01 +02:00
parent 0df9d39097 79ae94e504
commit 48d65fa29f
29 changed files with 1252 additions and 3227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/ground_script.h
View File

@@ -234,4 +234,7 @@ const ScriptCommand *FindLabel(Action *action, s32 r1);
const ScriptCommand *ResolveJump(Action *action, s32 r1);
void InitActionWithParams(Action *action, const CallbackData *callbacks, void *parent, s32 group, s32 sector);
// For gScriptLocks, gScriptLockConds, gUnlockBranchLabels
#define SCRIPT_LOCKS_ARR_COUNT 129
#endif // GUARD_GROUND_SCRIPT_H

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