Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

March 2025 #365

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/code_800C9CC.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef GUARD_CODE_800D090_H
#define GUARD_CODE_800D090_H
#ifndef GUARD_CODE_800C9CC_H
#define GUARD_CODE_800C9CC_H

#include "input.h"

Expand All @@ -8,4 +8,4 @@ void xxx_call_update_bg_sound_input(void);

void sub_800CB20(void);

#endif // GUARD_CODE_800D090_H
#endif // GUARD_CODE_800C9CC_H
10 changes: 10 additions & 0 deletions include/dungeon.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,23 @@ extern const DungeonName gDungeonNames[];

s32 GetDungeonFloorCount(u8 dungeon);
const u8 *GetDungeonName1(u8 dungeon);
const u8 *GetDungeonName2(u8 dungeon);
bool8 IsStairDirectionUp(u8 dungeon);
s16 GetTurnLimit(u8 dungeon);
u32 GetMaxItemsAllowed(u8 dungeon);
s8 GetRescuesAllowed(u8 dungeon);
bool8 HasCheckpoint(u8 dungeon);
s16 GetRandomMovementChance(u8 dungeon);
void PrintYellowDungeonNametoBuffer(u8 *buffer, DungeonLocation *dungeonLocation);
void PrintDungeonLocationtoBuffer(u8 *buffer, DungeonLocation *dungeonLocation);
bool8 IsKeepMoney(u8 dungeon);
bool8 IsLevelResetTo1(u8 dungeon);
bool8 DoEnemiesEvolveWhenKOed(u8 dungeon);
void CopyDungeonName1toBuffer(u8 *buffer, DungeonLocation *dungeonLocation);
s32 sub_80902C8(u8 dungeon);
void sub_80901D8(DungeonLocation *param_1,DungeonLocation *param_2);
bool8 CanLeaderSwitch(u8 dungeon);
bool8 sub_809017C(DungeonLocation* a1);

u32 sub_80908D8(DungeonLocation *dungeon);
u8 sub_8090910(DungeonLocation *dungeon, u32 param_2);
Expand Down
1 change: 1 addition & 0 deletions include/dungeon_action.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include "structs/dungeon_entity.h"

void SetLeaderActionToNothing(bool8 clearActionFields);
void sub_8044C50(u16 action);
void ClearMonsterActionFields(ActionContainer *actionPointer);
void SetMonsterActionFields(ActionContainer *actionPointer, u16 action);
Expand Down
1 change: 1 addition & 0 deletions include/dungeon_move.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "structs/str_pokemon.h"
#include "structs/str_moves.h"

bool8 HandleRegularDamagingMove(Entity *attacker, Entity *target, Move *move, s32 itemId);
bool8 TryUseChosenMove(struct Entity *attacker, u32 r6, s32 itemId, u32 var_30, bool32 isLinkedMove, struct Move *move);

#endif
9 changes: 9 additions & 0 deletions include/dungeon_music.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#ifndef GUARD_DUNGEON_MUSIC_H
#define GUARD_DUNGEON_MUSIC_H

#include "structs/dungeon_entity.h"

void PlaySoundEffect(u32 songIndex);
void StopSoundEffect(u32 songIndex);
bool8 IsFanfareSEPlaying_2(u16 songIndex);
Expand All @@ -11,6 +13,13 @@ void DungeonStopBGM(void);
u16 DungeonGetCurrentBGSong(void);
void StopDungeonBGM(void);
void UpdateDungeonMusic(void);
void PlayDungeonCursorSE(bool8 checkMenuEntriesCount);
void PlayDungeonConfirmationSE(void);
void PlayDungeonCancelSE(void);
void PlayDungeonStartButtonSE(void);
void sub_8083D1C(void);
void sub_8083AB0(s16 param_0, Entity * target, Entity * entity);


#endif

5 changes: 4 additions & 1 deletion include/game_options.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,8 @@ bool8 GameOptionsNotChange(GameOptions *);
void InitializeGameOptions(bool8 initializeGender);
void LoadGameOptions(void);
void SetWindowBGColor(void);
bool8 sub_8094C48(void);
bool8 DoesNotHaveShadedMap(void);
void sub_8094C88(void);

#endif // GUARD_GAME_OPTIONS_H
#endif // GUARD_GAME_OPTIONS_H
51 changes: 51 additions & 0 deletions include/item_actions.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
#ifndef INCLUDE_ITEM_ACTIONS_H
#define INCLUDE_ITEM_ACTIONS_H

#include "structs/dungeon_entity.h"
void sub_80479B8(bool8 param_1, bool8 param_2, u8 param_3, Entity *pokemon, Entity *target, Item *item);
bool8 sub_8048D50(Entity * pokemon, Item *item);
bool8 sub_8048950(Entity *param_1, Item *item);
bool8 sub_8048A68(Entity *param_1,Item *item);
bool8 sub_8048B9C(Entity *entity, Item *item);
void StunSeedItemAction(Entity *pokemon, Entity *target);
void MaxElixirAction(Entity *pokemon, Entity *target);
void ProteinItemAction(Entity *pokemon, Entity *target);
void CalciumItemAction(Entity *pokemon, Entity *target);
void IronItemAction(Entity *pokemon, Entity *target);
void ZincItemAction(Entity *pokemon, Entity *target);
void sub_80487CC(Entity *pokemon, Entity *target, u32 param_3, u32 param_4);
void GrimyFoodItemAction(Entity *pokemon, Entity *target);
void HandleGummiItemAction(Entity *pokemon, Entity *target, u8 r2);
void IcePartItemAction(Entity *pokemon, Entity *target, u8 r2);
void SteelPartItemAction(Entity *pokemon, Entity *target, u8 r2);
void RockPartItemAction(Entity *pokemon, Entity *target, u8 r2);
void MusicBoxItemAction(Entity *pokemon, Entity *target, u8 r2);
void nullsub_94(Entity *pokemon, Entity *target, u8 r2);
void KeyItemAction(Entity *pokemon, Entity *target, u8 r2);
void sub_8048340(Entity *pokemon, Entity *target, u32 r2);
void HealSeedItemAction(Entity *pokemon, Entity *target, u8 r2);
void WishStoneItemAction(Entity *pokemon, Entity *target, u8 r2);
void OranBerryItemAction(Entity *pokemon, Entity *target);
void ChestoBerryItemAction(Entity *pokemon, Entity *target);
void JoySeedItemAction(Entity *pokemon, Entity *target);
void GinsengItemAction(Entity *pokemon, Entity *target);
void BlastSeedItemAction(Entity *pokemon, Entity *target, u8 r2);
void SitrusBerryItemAction(Entity *pokemon, Entity *target);
void WarpSeedItemAction(Entity *pokemon, Entity *target);
void PlainSeedItemAction(Entity *pokemon, Entity *target);
void SleepSeedItemAction(Entity *pokemon, Entity *target);
void TotterSeedItemAction(Entity *pokemon, Entity *target);
void CheriBerryItemAction(Entity *pokemon, Entity *target);
void PechaBerryItemAction(Entity *pokemon, Entity *target);
void QuickSeedItemAction(Entity *pokemon, Entity *target);
void HungerSeedItemAction(Entity *pokemon, Entity *target);
void RawstBerryItemAction(Entity *pokemon, Entity *target);
void LifeSeedItemAction(Entity *pokemon, Entity *target);
void AllureSeedItemAction(Entity *pokemon, Entity *target);
void EyedropSeedItemAction(Entity *pokemon, Entity *target);
void BlinkerSeedItemAction(Entity *pokemon, Entity *target);
void DoomSeedItemAction(Entity *pokemon, Entity *target);
void sub_80482FC(Entity *pokemon, Entity *target, u32 pp, u8 param_4);


#endif /* ifndef INCLUDE_ITEM_ACTIONS_H */
Loading