Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-09-30 12:58:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

dungeon cutscene work

Browse Source
This commit is contained in:
DizzyEggg
2025-08-29 12:01:47 +02:00
parent 06e932b568
commit 7745feafd7
45 changed files with 229 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/code_8085E98.h
View File

@@ -1,6 +0,0 @@
#ifndef GUARD_CODE_8085E98_H
#define GUARD_CODE_8085E98_H
void sub_8085E98(void);
#endif

10
include/code_80861A8.h
View File

@@ -1,10 +0,0 @@
#ifndef GUARD_CODE_80861A8_H
#define GUARD_CODE_80861A8_H
#include "structs/dungeon_entity.h"
void sub_80861A8(Entity *a0);
void sub_80861B8(Entity *a0, u8 r1, s32 direction);
void sub_80861D4(Entity *a0, u8 r1, s32 direction);
#endif

50
include/dungeon_cutscene.h Normal file
View File

@@ -0,0 +1,50 @@
#ifndef GUARD_DUNGEON_CUTSCENE_H
#define GUARD_DUNGEON_CUTSCENE_H
#include "structs/str_position.h"
#include "structs/dungeon_entity.h"
typedef void (*DungeonCallback)(Entity *);
typedef struct struct_8085B80 {
u8 unk0;
Entity *unk4;
s32 unk8;
s16 *unkC;
} struct_8085B80;
void sub_80847D4(void);
bool8 ShouldShowDungeonBanner(void);
void sub_80848F0(void);
void DisplayPreFightDialogue(void);
void sub_8084E00(Entity *entity, u8 param_2, u8 param_3);
void sub_8085140(void);
bool8 sub_808529C(s32 speciesId_);
void sub_8085374(void);
Entity *CutsceneGetLeader(void);
Entity *CutsceneGetPartner(void);
void sub_80854D4(void);
void sub_80855E4(DungeonCallback func);
void sub_808563C(DungeonCallback func);
Entity *GetEntityFromMonsterBehavior(u8 entityType);
void sub_80856C8(Entity * pokemon, s32 x, s32 y);
void sub_80856E0(Entity * pokemon, s32 direction);
void sub_8085860(s32 x, s32 y);
void ShiftCameraToPosition(PixelPos *posStruct, s32 cameraSteps);
void SetFacingDirection(Entity *pokemon, s32 direction);
void sub_8085930(s32 direction);
bool8 ShouldRunMonsterAI(Entity *pokemon);
void sub_8085B4C(struct_8085B80 a0[], s16 *a1[], Entity *a2[], s32 a3);
bool8 sub_8085B80(struct_8085B80 *a0);
void SetDungeonBGColorRGB(s32 r, s32 g, s32 b, bool8 a3, bool8 a4);
void sub_8085E98(void);
void sub_8085EB0(void);
u32 sub_8085EC8(s16 param_1,u32 param_2,u32 param_3,DungeonPos *param_4, bool32 param_5);
void sub_8085F44(s32 param_1);
void sub_8085F78(void);
bool8 sub_80860A8(u8 id);
void sub_8086130(void);
void sub_80861A8(Entity *a0);
void sub_80861B8(Entity *a0, u8 r1, s32 direction);
void sub_80861D4(Entity *a0, u8 r1, s32 direction);
#endif

8
include/dungeon_cutscenes.h
View File

@@ -1,5 +1,7 @@
#ifndef GUARD_DUNGEON_CUTSCENE_H
#define GUARD_DUNGEON_CUTSCENE_H
#ifndef GUARD_DUNGEON_CUTSCENES_H
#define GUARD_DUNGEON_CUTSCENES_H
// TODO: Remove this file
#include "structs/dungeon_entity.h"
@@ -139,4 +141,4 @@ void sub_808CBB0(void);
void sub_808CD44(void);
void sub_808CD9C(void);
#endif /* ifndef GUARD_DUNGEON_CUTSCENE_H */
#endif /* ifndef GUARD_DUNGEON_CUTSCENES_H */

32
include/dungeon_util_1.h
View File

@@ -1,32 +0,0 @@
#ifndef GUARD_DUNGEON_UTIL_1_H
#define GUARD_DUNGEON_UTIL_1_H
#include "structs/dungeon_entity.h"
typedef void (*DungeonCallback)(Entity *);
typedef struct struct_8085B80 {
u8 unk0;
Entity *unk4;
s32 unk8;
s16 *unkC;
} struct_8085B80;
Entity *xxx_call_GetLeader(void);
Entity *GetPartnerEntity(void);
void sub_80854D4(void);
void sub_80855E4(DungeonCallback func);
void sub_808563C(DungeonCallback func);
Entity *GetEntityFromMonsterBehavior(u8 entityType);
void sub_80856C8(Entity * pokemon, s32 x, s32 y);
void sub_80856E0(Entity * pokemon, s32 direction);
void sub_8085764(void);
void sub_8085860(s32 x, s32 y);
void ShiftCameraToPosition(PixelPos *posStruct, s32 cameraSteps);
void SetFacingDirection(Entity *pokemon, s32 direction);
void sub_8085930(s32 direction);
void sub_80859F0(s32 direction);
bool8 ShouldRunMonsterAI(Entity *entity);
void sub_8085B4C(struct_8085B80 a0[], s16 *a1[], Entity *a2[], s32 a3);
void sub_80857B8(void);
#endif // GUARD_DUNGEON_UTIL_1_H

4
ld_script.ld
View File

@@ -278,7 +278,7 @@ SECTIONS {
src/dungeon_random.o(.text);
src/dungeon_cleared_window.o(.text);
src/dungeon_jobs.o(.text);
src/code_80848F0.o(.text);
src/dungeon_cutscene.o(.text);
src/dungeon_cutscene_skarmory.o(.text);
src/dungeon_cutscene_meanies.o(.text);
src/dungeon_cutscene_zapdos.o(.text);
@@ -666,7 +666,7 @@ SECTIONS {
src/dungeon_random.o(.rodata);
src/dungeon_cleared_window.o(.rodata);
src/dungeon_jobs.o(.rodata);
src/code_80848F0.o(.rodata);
src/dungeon_cutscene.o(.rodata);
src/dungeon_cutscene_skarmory.o(.rodata);
src/dungeon_cutscene_meanies.o(.rodata);
src/dungeon_cutscene_zapdos.o(.rodata);

4
src/code_8041AD0.c
View File

@@ -28,7 +28,7 @@
#include "dungeon_music.h"
#include "memory.h"
#include "random.h"
#include "dungeon_util_1.h"
#include "dungeon_cutscene.h"
#include "effect_data.h"
#include "dungeon_pos_data.h"
#include "dungeon_damage.h"
@@ -1554,7 +1554,7 @@ void sub_8042B34(s32 a0, s32 a1, s32 a2)
unkStruct_80416E0 spStruct;
s32 i;
s32 r8 = 0;
Entity *leader = xxx_call_GetLeader();
Entity *leader = CutsceneGetLeader();
gUnknown_203B414 = MemoryAlloc(sizeof(*gUnknown_203B414), 7);
gUnknown_203B414->unk0 = a0;

9
src/code_806FDF4.c
View File

@@ -20,15 +20,14 @@
#include "pokemon_3.h"
#include "position_util.h"
#include "text_util.h"
#include "dungeon_util_1.h"
#include "math.h"
#include "dungeon_config.h"
#include "dungeon_strings.h"
#include "dungeon_music.h"
#include "dungeon_cutscene.h"
#include "string_format.h"
u8 sub_806B8CC();
u8 sub_808529C(s32);
void nullsub_96(Entity *pokemon,Entity *target);
u8 sub_8097900(s16);
void sub_806F910(void);
@@ -192,7 +191,7 @@ bool8 sub_806F9BC(s16 species)
if (!gDungeon->unk644.canRecruit) {
return FALSE;
}
else if (sub_808529C(id) == 0) {
else if (!sub_808529C(id)) {
return FALSE;
}
else if (id == MONSTER_MEW && gDungeon->unk644.unk34 == 1) {
@@ -319,7 +318,7 @@ bool8 sub_806FA5C(Entity *entity1, Entity *entity2, struct unkStruct_8069D4C *pa
sub_808D9DC(gFormatBuffer_Monsters[0],pokeStruct2,0);
LogMessageByIdWithPopupCheckUser(entity1,gUnknown_80FA0F0);
if (flag) {
leader = xxx_call_GetLeader();
leader = CutsceneGetLeader();
SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0],leader,0);
sub_8092558(gFormatBuffer_FriendArea,friendArea);
PlaySound(0xce);
@@ -450,7 +449,7 @@ bool8 sub_806FDF4(Entity *entity1,Entity *entity2,Entity **entityPtr)
}
}
if (flag) {
leader = xxx_call_GetLeader();
leader = CutsceneGetLeader();
SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0],leader,0);
sub_8092558(gFormatBuffer_FriendArea,friendArea);
PlaySound(0xce);

2
src/code_8075708.c
View File

@@ -46,6 +46,7 @@
#include "dungeon_pos_data.h"
#include "dungeon_turn_effects.h"
#include "dungeon_leveling.h"
#include "dungeon_cutscene.h"
#include "warp_target.h"
extern void sub_8073D14(Entity *);
@@ -58,7 +59,6 @@ extern bool8 TryUseChosenMove(struct Entity *, u32, u32, u32, u32, struct Move *
extern void nullsub_97(Entity *entity);
extern void CheckLeaderTile(void);
extern void sub_8086AC0(void);
extern void sub_8085140(void);
extern void sub_8075708(Entity *entity);
extern void TryForcedLoss(u32);
extern void sub_8075900(Entity *pokemon, u8 r1);

2
src/dungeon_8072CF4.c
View File

@@ -34,6 +34,7 @@
#include "dungeon_action.h"
#include "dungeon_turn_effects.h"
#include "dungeon_leveling.h"
#include "dungeon_cutscene.h"
#include "warp_target.h"
extern u8 gUnknown_202F221;
@@ -47,7 +48,6 @@ extern void sub_80671A0(Entity *);
extern void sub_8067110(Entity *);
void HandleUseMoveAIAction(Entity *target);
void sub_8041888(u8 param_1);
void sub_8085140(void);
void sub_807360C(void);
void sub_805EFB4(Entity *, u8);
void sub_8074FB0(Entity *, u8, DungeonPos *);

5
src/dungeon_ai.c
View File

@@ -22,15 +22,14 @@
#include "dungeon_map_access.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "pokemon.h"
#include "status_checks.h"
#include "structs/map.h"
#include "structs/str_dungeon.h"
#include "dungeon_misc.h"
extern char *gPtrCouldntBeUsedMessage;
#include "dungeon_cutscene.h"
#include "dungeon_strings.h"
void RunMonsterAI(Entity *pokemon, u32 unused)
{

56
src/code_80848F0.c → src/dungeon_cutscene.c
View File

@@ -1,5 +1,6 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "constants/weather.h"
#include "constants/dungeon.h"
#include "constants/direction.h"
@@ -10,7 +11,6 @@
#include "dungeon_cutscenes.h"
#include "dungeon_music.h"
#include "dungeon_logic.h"
#include "dungeon_util_1.h"
#include "exclusive_pokemon.h"
#include "weather.h"
#include "pokemon.h"
@@ -19,8 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_vram.h"
#include "code_806CD90.h"
#include "code_80861A8.h"
#include "code_8085E98.h"
#include "dungeon_range.h"
#include "random.h"
#include "math.h"
@@ -49,19 +47,14 @@ struct RgbS16
extern OpenedFile *gDungeonPaletteFile;
extern RGB gUnknown_202ECA4[];
extern const u8 gUnknown_8107358[25];
extern bool8 sub_8004C00(unkStruct_202EE8C *a0, s32 a1, s32 a2, s32 brightness, const RGB *ramp, struct RgbS16 *a5);
extern void sub_803F878(s32, s32);
extern void sub_8085F44(s32);
extern bool8 sub_800E90C(DungeonPos *);
extern void sub_8088EE8(void);
extern void sub_8088848(void);
extern void sub_808A718(void);
extern s32 sub_800E700(s32);
extern void sub_8085F44(s32);
extern void sub_8052FB8(const u8 *);
extern void sub_8085EB0(void);
extern void sub_8086A54(Entity *);
extern void sub_8086A3C(Entity *);
extern u32 sub_8002A70(u32, s32, u8);
@@ -78,6 +71,8 @@ struct unkData_8107234
};
static void sub_8084854(const struct unkData_8107234 *);
static void sub_8085764(void);
static void sub_80857B8(void);
static void sub_80861EC(Entity *);
static const struct unkData_8107234 gUnknown_8107234[28] = {
@@ -141,7 +136,7 @@ void sub_80847D4(void)
sub_8097FF8();
}
void sub_8084854(const struct unkData_8107234 *param_1)
static void sub_8084854(const struct unkData_8107234 *param_1)
{
if (gDungeon->unk644.unk34 != 0) {
gDungeon->unk3A0D = param_1->unk5;
@@ -163,9 +158,9 @@ void sub_8084854(const struct unkData_8107234 *param_1)
sub_807E5E4(WEATHER_CLEAR);
}
u32 sub_80848EC(void)
bool8 ShouldShowDungeonBanner(void)
{
return 1;
return TRUE;
}
void sub_80848F0(void)
@@ -664,7 +659,7 @@ void sub_8085140(void)
}
}
u8 sub_808529C(s32 speciesId_)
bool8 sub_808529C(s32 speciesId_)
{
s32 r3;
s32 speciesId = 0;
@@ -783,12 +778,12 @@ void sub_8085374(void)
}
}
Entity *xxx_call_GetLeader(void)
Entity *CutsceneGetLeader(void)
{
return GetLeader();
}
Entity *GetPartnerEntity(void)
Entity *CutsceneGetPartner(void)
{
s32 counter;
Entity *entity;
@@ -889,7 +884,7 @@ void sub_80855E4(DungeonCallback func)
func(entity);
}
}
if ((!flag) && (partnerEntity = GetPartnerEntity(), partnerEntity != NULL)) {
if ((!flag) && (partnerEntity = CutsceneGetPartner(), partnerEntity != NULL)) {
func(partnerEntity);
}
}
@@ -910,13 +905,12 @@ void sub_808563C(DungeonCallback func)
Entity *GetEntityFromMonsterBehavior(u8 entityType)
{
Entity * entity;
s32 index;
for(index = 0; index < DUNGEON_MAX_POKEMON; index++)
{
entity = gDungeon->activePokemon[index];
if ((EntityIsValid(entity)) && (GetEntInfo(entity)->monsterBehavior == entityType)) return entity;
for (index = 0; index < DUNGEON_MAX_POKEMON; index++) {
Entity *entity = gDungeon->activePokemon[index];
if (EntityIsValid(entity) && GetEntInfo(entity)->monsterBehavior == entityType)
return entity;
}
return NULL;
}
@@ -952,7 +946,7 @@ void sub_80856E0(Entity * pokemon, s32 direction)
DungeonRunFrameActions(0x46);
}
void sub_8085764(void)
static void sub_8085764(void)
{
Entity *entity;
s32 index;
@@ -968,19 +962,16 @@ void sub_8085764(void)
}
}
void sub_80857B8(void)
static void sub_80857B8(void)
{
u8 *direction;
EntityInfo *entityInfo;
Entity *entity;
int index;
for(index = 0; index < DUNGEON_MAX_POKEMON; index++)
{
entity = gDungeon->activePokemon[index];
for (index = 0; index < DUNGEON_MAX_POKEMON; index++) {
Entity *entity = gDungeon->activePokemon[index];
if (EntityIsValid(entity)) {
entityInfo = GetEntInfo(entity);
if ((gDungeon->unk4 == 0) && (gDungeon->unk2 == 0)) {
EntityInfo *entityInfo = GetEntInfo(entity);
if (gDungeon->unk4 == 0 && gDungeon->unk2 == 0) {
UpdateEntityPixelPos(entity, 0);
entityInfo->unk15C = 0;
entityInfo->unkFE = 99;
@@ -1077,7 +1068,7 @@ void sub_8085930(s32 direction)
}
}
void sub_80859F0(s32 direction)
static void sub_80859F0(s32 direction)
{
s32 index;
Entity *entity;
@@ -1379,7 +1370,6 @@ void sub_8085F78(void)
case 0x2A:
sub_808A718();
break;
case 0:
case 0x3C:
default:
@@ -1454,7 +1444,7 @@ void sub_80861D4(Entity *a0, u8 r1, s32 direction)
sub_80861EC(a0);
}
void sub_80861EC(Entity *a0)
static void sub_80861EC(Entity *a0)
{
GetEntInfo(a0)->unkFE = 0x63;
}
@@ -1759,7 +1749,7 @@ void sub_8086690(void)
void sub_80866C4(const struct DungeonDialogueStruct *dialogue)
{
SpriteLookAroundEffect(xxx_call_GetLeader());
SpriteLookAroundEffect(CutsceneGetLeader());
sub_803E708(10, 70);
DisplayDungeonDialogue(dialogue);
sub_803E708(10, 70);

22
src/dungeon_cutscene_articuno.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -37,20 +36,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -64,7 +56,7 @@ void sub_8087F54(void)
Entity *leaderEntity;
Entity *articunoEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
articunoEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ARTICUNO);
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
sub_8085374();
@@ -96,7 +88,7 @@ void sub_8087FF8(void)
Entity *leaderEntity;
Entity *articunoEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
articunoEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ARTICUNO);
sub_8085374();
sub_80854D4();
@@ -128,8 +120,8 @@ void ArticunoPreFightDialogue(void)
Entity *partnerEntity;
Entity *articunoEntity;
leaderEntity = xxx_call_GetLeader();
partnerEntity = GetPartnerEntity();
leaderEntity = CutsceneGetLeader();
partnerEntity = CutsceneGetPartner();
articunoEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ARTICUNO);
sub_8086448();
SpriteLookAroundEffect(partnerEntity);
@@ -205,7 +197,7 @@ void ArticunoReFightDialogue(void)
Entity *leaderEntity;
Entity *articunoEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
articunoEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ARTICUNO);
gDungeon->weather.unkE265 = WEATHER_SNOW;
sub_807EAA0(0,1);
@@ -227,7 +219,7 @@ void ArticunoPostStoryPreFightDialogue(void)
Entity *leaderEntity;
Entity *articunoEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
articunoEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ARTICUNO);
sub_8086448();
if (sub_8086AE4(MONSTER_ARTICUNO)) {

14
src/dungeon_cutscene_celebi.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -37,20 +36,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -66,7 +58,7 @@ void sub_808C5C0(void)
u32 XPos;
s32 YPos;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
celebiEntity = GetEntityFromMonsterBehavior(BEHAVIOR_CELEBI);
DungeonStartNewBGM(MUS_FRIEND_AREA_HEALING_FOREST);
sub_80854D4();
@@ -90,7 +82,7 @@ void CelebiJoinDialogue(void)
s32 menuChoice;
Entity *celebiEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
celebiEntity = GetEntityFromMonsterBehavior(BEHAVIOR_CELEBI);
if ((HasRecruitedMon(MONSTER_CELEBI)) || (!sub_806FD18(celebiEntity)))
{

14
src/dungeon_cutscene_deoxys.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -36,20 +35,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -64,7 +56,7 @@ void sub_808C3A0(void)
{
Entity * leaderEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
DungeonStopBGM();
sub_80854D4();
sub_8085930(DIRECTION_NORTH);
@@ -92,7 +84,7 @@ void DeoxysPreFightDialogue(void)
{
Entity * leaderEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
sub_8086448();
if (HasRecruitedMon(MONSTER_DEOXYS_NORMAL)) {
// There appears to be no one here.

5
src/dungeon_cutscene_empty_summit.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -46,7 +45,7 @@ void sub_80885C4(void)
{
Entity * leaderEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
DungeonFadeOutBGM(0x3c);
sub_803E708(0x3c,0x46);
DungeonStopBGM();

20
src/dungeon_cutscene_entei.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -35,20 +34,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -60,7 +52,7 @@ void sub_8089C44(void)
Entity * leaderEntity;
Entity * EnteiEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
EnteiEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ENTEI);
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
sub_80854D4();
@@ -75,7 +67,7 @@ void sub_8089C90(void)
Entity * leaderEntity;
Entity * EnteiEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
EnteiEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ENTEI);
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
sub_80854D4();
@@ -103,7 +95,7 @@ void EnteiPreFightDialogue(void)
Entity * leaderEntity;
Entity * EnteiEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
EnteiEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ENTEI);
EnteiScreenFlash();
DisplayDungeonDialogue(&gEnteiPreFightDialogue_1);
@@ -121,7 +113,7 @@ void EnteiReFightDialogue(void)
Entity * leaderEntity;
Entity * EnteiEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
EnteiEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ENTEI);
EnteiScreenFlash();
DisplayDungeonDialogue(&gEnteiReFightDialogue_1);
@@ -139,7 +131,7 @@ void EnteiPostStoryPreFightDialogue(void)
Entity * leaderEntity;
Entity * EnteiEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
EnteiEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ENTEI);
if (HasRecruitedMon(MONSTER_ENTEI)) {
sub_80866C4(&gEnteiPostStoryPreFightDialogue_4);

23
src/dungeon_cutscene_groudon.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -37,19 +36,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -64,7 +57,7 @@ void sub_808862C(void)
Entity * alakazamEntity;
Entity * groudonEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
alakazamEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ALAKAZAM_1);
groudonEntity = GetEntityFromMonsterBehavior(BEHAVIOR_GROUDON_2);
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
@@ -91,7 +84,7 @@ void sub_80886C4(void)
u32 XPos;
s32 YPos;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
alakazamEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ALAKAZAM_1);
groudonEntity = GetEntityFromMonsterBehavior(BEHAVIOR_GROUDON_2);
PlaySoundEffect(0x3e5);
@@ -116,7 +109,7 @@ void sub_808875C(void)
Entity * alakazamEntity;
Entity * groudonEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
alakazamEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ALAKAZAM_1);
groudonEntity = GetEntityFromMonsterBehavior(BEHAVIOR_GROUDON_2);
sub_80867F4();
@@ -157,8 +150,8 @@ void GroudonPreFightDialogue(void)
Entity * alakazamEntity;
Entity * groudonEntity;
leaderEntity = xxx_call_GetLeader();
partnerEntity = GetPartnerEntity();
leaderEntity = CutsceneGetLeader();
partnerEntity = CutsceneGetPartner();
alakazamEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ALAKAZAM_1);
groudonEntity = GetEntityFromMonsterBehavior(BEHAVIOR_GROUDON_2);
sub_8086448();
@@ -237,7 +230,7 @@ void GroudonReFightDialogue(void)
Entity * leaderEntity;
Entity * groudonEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
groudonEntity = GetEntityFromMonsterBehavior(BEHAVIOR_GROUDON_2);
sub_8086838(1,1,1);
sub_808680C();
@@ -269,7 +262,7 @@ void GroudonPostStoryPreFightDialogue(void)
Entity * leaderEntity;
Entity * groudonEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
groudonEntity = GetEntityFromMonsterBehavior(BEHAVIOR_GROUDON_2);
sub_8086448();
if (sub_8086AE4(MONSTER_GROUDON)) {

18
src/dungeon_cutscene_hooh.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -35,20 +34,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -61,7 +53,7 @@ void sub_808A608(void)
Entity * leaderEntity;
Entity * HoOhEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
HoOhEntity = GetEntityFromMonsterBehavior(BEHAVIOR_HO_OH);
DungeonStartNewBGM(MUS_FRIEND_AREA_RAINBOW_PEAK);
sub_80867F4();
@@ -79,7 +71,7 @@ void sub_808A668(void)
Entity * leaderEntity;
Entity * HoOhEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
HoOhEntity = GetEntityFromMonsterBehavior(BEHAVIOR_HO_OH);
DungeonStartNewBGM(MUS_FRIEND_AREA_RAINBOW_PEAK);
sub_80867F4();
@@ -116,7 +108,7 @@ void HoOhPreFightDialogue(void)
Entity * HoOhEntity;
PixelPos local_14;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
HoOhEntity = GetEntityFromMonsterBehavior(BEHAVIOR_HO_OH);
local_14.x = leaderEntity->pixelPos.x;
local_14.y = leaderEntity->pixelPos.y + -0x1000;
@@ -155,7 +147,7 @@ void HoOhReFightDialogue(void)
Entity * HoOhEntity;
PixelPos local_14;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
HoOhEntity = GetEntityFromMonsterBehavior(BEHAVIOR_HO_OH);
local_14.x = leaderEntity->pixelPos.x;

16
src/dungeon_cutscene_jirachi.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -37,20 +36,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -72,7 +64,7 @@ void sub_808B2F4(void)
Entity * leaderEntity;
Entity * jirachiEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
jirachiEntity = GetEntityFromMonsterBehavior(BEHAVIOR_JIRACHI);
DungeonStartNewBGM(MUS_FRIEND_AREA_FOREST);
CreateJirachiWishWarpTile();
@@ -91,7 +83,7 @@ void sub_808B35C(void)
Entity * leaderEntity;
Entity * jirachiEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
jirachiEntity = GetEntityFromMonsterBehavior(BEHAVIOR_JIRACHI);
DungeonStartNewBGM(MUS_FRIEND_AREA_FOREST);
sub_80854D4();
@@ -141,7 +133,7 @@ void JirachiPreFightDialogue(void)
Entity * leaderEntity;
Entity * jirachiEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
jirachiEntity = GetEntityFromMonsterBehavior(BEHAVIOR_JIRACHI);
sub_8086448();
sub_803E708(0x40,70);

14
src/dungeon_cutscene_kyogre.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -37,20 +36,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -67,7 +59,7 @@ void sub_808C10C(void)
u32 XPos;
s32 YPos;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
kyogreEntity = GetEntityFromMonsterBehavior(BEHAVIOR_KYOGRE);
DungeonStopBGM();
sub_80854D4();
@@ -100,7 +92,7 @@ void KyogrePreFightDialogue(void)
Entity *leaderEntity;
Entity *KyogreEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
KyogreEntity = GetEntityFromMonsterBehavior(BEHAVIOR_KYOGRE);
DungeonStopBGM();
if (HasRecruitedMon(MONSTER_KYOGRE)) {

20
src/dungeon_cutscene_latios.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -36,20 +35,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -61,7 +53,7 @@ void sub_808A9E4(void)
Entity * leaderEntity;
Entity * LatiosEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
LatiosEntity = GetEntityFromMonsterBehavior(BEHAVIOR_LATIOS);
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
sub_80854D4();
@@ -77,7 +69,7 @@ void sub_808AA3C(void)
Entity * leaderEntity;
Entity * LatiosEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
LatiosEntity = GetEntityFromMonsterBehavior(BEHAVIOR_LATIOS);
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
sub_80854D4();
@@ -93,7 +85,7 @@ void sub_808AA94(void)
Entity * leaderEntity;
Entity * LatiosEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
LatiosEntity = GetEntityFromMonsterBehavior(BEHAVIOR_LATIOS);
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
sub_80854D4();
@@ -119,7 +111,7 @@ void LatiosPreFightDialogue(void)
PixelPos local_18;
DungeonPos local_19;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
LatiosEntity = GetEntityFromMonsterBehavior(BEHAVIOR_LATIOS);
local_18.x = LatiosEntity->pixelPos.x;
@@ -150,7 +142,7 @@ void LatiosReFightDialogue(void)
Entity * leaderEntity;
Entity * LatiosEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
LatiosEntity = GetEntityFromMonsterBehavior(BEHAVIOR_LATIOS);
sub_8086448();
sub_808692C();

14
src/dungeon_cutscene_lugia.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -36,20 +35,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -63,7 +55,7 @@ void sub_808BDEC(void)
Entity * leaderEntity;
Entity * lugiaEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
lugiaEntity = GetEntityFromMonsterBehavior(BEHAVIOR_LUGIA);
DungeonStopBGM();
sub_80854D4();
@@ -93,7 +85,7 @@ void LugiaPreFightDialogue(void)
Entity * leaderEntity;
Entity * lugiaEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
lugiaEntity = GetEntityFromMonsterBehavior(BEHAVIOR_LUGIA);
if (HasRecruitedMon(MONSTER_LUGIA)) {
sub_8086448();

20
src/dungeon_cutscene_magma_cavern.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -35,20 +34,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -62,7 +54,7 @@ void sub_8088DC0(void)
Entity * groudonEntity;
Entity * alakazamEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
groudonEntity = GetEntityFromMonsterBehavior(BEHAVIOR_GROUDON_1);
alakazamEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ALAKAZAM_2);
sub_80867F4();
@@ -86,7 +78,7 @@ void sub_8088E5C(void)
Entity * groudonEntity;
Entity * alakazamEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
groudonEntity = GetEntityFromMonsterBehavior(BEHAVIOR_GROUDON_1);
alakazamEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ALAKAZAM_2);
sub_80867F4();
@@ -115,8 +107,8 @@ void MagmaCavernMidDialogue(void)
s16 IDStack [2];
PixelPos pos;
leaderEntity = xxx_call_GetLeader();
partnerEntity = GetPartnerEntity();
leaderEntity = CutsceneGetLeader();
partnerEntity = CutsceneGetPartner();
groudonEntity = GetEntityFromMonsterBehavior(BEHAVIOR_GROUDON_1);
alakazamEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ALAKAZAM_2);
sub_8052D44(IDStack,leaderEntity,partnerEntity);
@@ -232,7 +224,7 @@ void sub_8089168(void)
{
Entity *leaderEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
sub_8086448();
sub_803E708(10,0x46);
SpriteLookAroundEffect(leaderEntity);

18
src/dungeon_cutscene_mankey.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -35,20 +34,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -60,7 +52,7 @@ void sub_808970C(void)
{
Entity *leaderEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
DungeonStartNewBGM(MUS_TINY_WOODS);
sub_80854D4();
sub_8085930(DIRECTION_NORTH);
@@ -73,7 +65,7 @@ void sub_808974C(void)
{
Entity *leaderEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
sub_80854D4();
sub_8085930(DIRECTION_NORTH);
sub_80855E4(sub_8086A3C);
@@ -108,7 +100,7 @@ void sub_80897F0(void)
{
Entity *leaderEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
sub_8086448();
sub_803E708(10,0x46);
sub_808563C(SpriteShockEffect);
@@ -143,7 +135,7 @@ void sub_8089878(void)
{
Entity *leaderEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
sub_8086448();
sub_803E708(10,0x46);
sub_808563C(SpriteShockEffect);

20
src/dungeon_cutscene_meanies.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -35,20 +34,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -59,7 +51,7 @@ void sub_8086E9C(void)
{
Entity * leaderEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
sub_8085374();
sub_80854D4();
@@ -76,7 +68,7 @@ void sub_8086F00(void)
{
Entity * leaderEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
sub_80854D4();
sub_8085930(DIRECTION_NORTH);
sub_80855E4(sub_8086A3C);
@@ -114,7 +106,7 @@ void TeamMeaniesPreFightDialogue(void)
{
Entity *leaderEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
sub_8086448();
sub_803E708(10, 0x46);
DisplayDungeonDialogue(gTeamMeaniesPreFightDialogue_1);
@@ -141,8 +133,8 @@ void TeamMeaniesReFightDialogue(void)
Entity *leaderEntity;
Entity *partnerEntity;
leaderEntity = xxx_call_GetLeader();
partnerEntity = GetPartnerEntity();
leaderEntity = CutsceneGetLeader();
partnerEntity = CutsceneGetPartner();
sub_8086448();
DisplayDungeonDialogue(gTeamMeaniesReFightDialogue_1);
sub_803E708(10, 0x46);

14
src/dungeon_cutscene_medicham.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -35,20 +34,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -58,7 +50,7 @@ void sub_808C9C4(void)
Entity *leaderEntity;
Entity *medichamEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
medichamEntity = GetEntityFromMonsterBehavior(BEHAVIOR_MEDICHAM);
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
sub_80854D4();
@@ -126,7 +118,7 @@ void sub_808CB5C(void)
Entity *leaderEntity;
Entity *medichamEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
medichamEntity = GetEntityFromMonsterBehavior(BEHAVIOR_MEDICHAM);
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
sub_80854D4();

18
src/dungeon_cutscene_mewtwo.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -35,20 +34,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -61,7 +53,7 @@ void sub_8089914(void)
Entity *leaderEntity;
Entity *MewtwoEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
MewtwoEntity = GetEntityFromMonsterBehavior(BEHAVIOR_MEWTWO);
DungeonStopBGM();
gDungeon->unk7 = 1;
@@ -79,7 +71,7 @@ void sub_8089978(void)
Entity *leaderEntity;
Entity *MewtwoEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
MewtwoEntity = GetEntityFromMonsterBehavior(BEHAVIOR_MEWTWO);
DungeonStopBGM();
sub_80854D4();
@@ -111,7 +103,7 @@ void MewtwoPreFightDialogue(void)
Entity *leaderEntity;
Entity *MewtwoEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
MewtwoEntity = GetEntityFromMonsterBehavior(BEHAVIOR_MEWTWO);
sub_8086448();
DisplayDungeonDialogue(&gMewtwoPreFightDialogue_1);
@@ -138,7 +130,7 @@ void MewtwoReFightDialogue(void)
Entity *leaderEntity;
Entity *MewtwoEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
MewtwoEntity = GetEntityFromMonsterBehavior(BEHAVIOR_MEWTWO);
sub_8086448();
if(HasRecruitedMon(MONSTER_MEWTWO)) {

25
src/dungeon_cutscene_moltres.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -37,24 +36,16 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
extern void sub_8085F44(s32);
static void MoltresDropInEffect(Entity * moltresEntity);
static void MoltresScreenFlash1(s32 xArg, s32 yArg);
@@ -67,7 +58,7 @@ void sub_80877E8(void)
Entity * leaderEntity;
Entity * moltresEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
moltresEntity = GetEntityFromMonsterBehavior(BEHAVIOR_MOLTRES);
DungeonStartNewBGM(MUS_THE_MOUNTAIN_OF_FIRE);
sub_8085374();
@@ -88,7 +79,7 @@ void sub_8087848(void)
u32 XPos;
s32 YPos;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
moltresEntity = GetEntityFromMonsterBehavior(BEHAVIOR_MOLTRES);
DungeonStartNewBGM(MUS_THE_MOUNTAIN_OF_FIRE);
sub_80854D4();
@@ -123,8 +114,8 @@ void MoltresPreFightDialogue(void)
Entity *partnerEntity;
Entity *moltresEntity;
leaderEntity = xxx_call_GetLeader();
partnerEntity = GetPartnerEntity();
leaderEntity = CutsceneGetLeader();
partnerEntity = CutsceneGetPartner();
moltresEntity = GetEntityFromMonsterBehavior(BEHAVIOR_MOLTRES);
MoltresScreenFlash1(0xc,5);
sub_8086500();
@@ -192,8 +183,8 @@ void MoltresReFightDialogue(void)
Entity *partnerEntity;
Entity *moltresEntity;
leaderEntity = xxx_call_GetLeader();
partnerEntity = GetPartnerEntity();
leaderEntity = CutsceneGetLeader();
partnerEntity = CutsceneGetPartner();
moltresEntity = GetEntityFromMonsterBehavior(BEHAVIOR_MOLTRES);
MoltresScreenFlash1(10,5);
sub_8086500();
@@ -233,7 +224,7 @@ void MoltresPostStoryPreFightDialogue(void)
Entity * leaderEntity;
Entity * moltresEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
moltresEntity = GetEntityFromMonsterBehavior(BEHAVIOR_MOLTRES);
MoltresScreenFlash1(0xc,5);
sub_808654C();

22
src/dungeon_cutscene_raikou.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -36,20 +35,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -61,7 +53,7 @@ void sub_8089EFC(void)
Entity * leaderEntity;
Entity * RaikouEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
RaikouEntity = GetEntityFromMonsterBehavior(BEHAVIOR_RAIKOU);
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
sub_80854D4();
@@ -76,7 +68,7 @@ void sub_8089F44(void)
Entity * leaderEntity;
Entity * RaikouEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
RaikouEntity = GetEntityFromMonsterBehavior(BEHAVIOR_RAIKOU);
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
sub_80854D4();
@@ -91,7 +83,7 @@ void sub_8089F8C(void)
Entity * leaderEntity;
Entity * RaikouEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
RaikouEntity = GetEntityFromMonsterBehavior(BEHAVIOR_RAIKOU);
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
sub_80854D4();
@@ -119,7 +111,7 @@ void RaikouPreFightDialogue(void)
Entity * leaderEntity;
Entity * RaikouEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
RaikouEntity = GetEntityFromMonsterBehavior(BEHAVIOR_RAIKOU);
DisplayDungeonDialogue(&gRaikouPreFightDialogue_1);
RaikouScreenFlash();
@@ -144,7 +136,7 @@ void RaikouReFightDialogue(void)
Entity * leaderEntity;
Entity * RaikouEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
RaikouEntity = GetEntityFromMonsterBehavior(BEHAVIOR_RAIKOU);
gDungeon->weather.unkE265 = WEATHER_RAIN;
sub_807EAA0(0,1);
@@ -164,7 +156,7 @@ void RaikouPostStoryPreFightDialogue(void)
Entity * leaderEntity;
Entity * RaikouEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
RaikouEntity = GetEntityFromMonsterBehavior(BEHAVIOR_RAIKOU);
if (HasRecruitedMon(MONSTER_RAIKOU)) {
sub_80866C4(&gRaikouPostStoryPreFightDialogue_4);

22
src/dungeon_cutscene_rayquaza.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -36,20 +35,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -62,7 +54,7 @@ void sub_80892C8(void)
Entity * leaderEntity;
Entity * RayquazaEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
RayquazaEntity = GetEntityFromMonsterBehavior(BEHAVIOR_RAYQUAZA);
DungeonStartNewBGM(MUS_RAYQUAZAS_DOMAIN);
sub_8085374();
@@ -80,7 +72,7 @@ void sub_8089328(void)
Entity * leaderEntity;
Entity * rayquazaEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
rayquazaEntity = GetEntityFromMonsterBehavior(BEHAVIOR_RAYQUAZA);
DungeonStartNewBGM(MUS_RAYQUAZAS_DOMAIN);
sub_80854D4();
@@ -111,8 +103,8 @@ void RayquazaPreFightDialogue(void)
Entity *partnerEntity;
Entity *rayquazaEntity;
leaderEntity = xxx_call_GetLeader();
partnerEntity = GetPartnerEntity();
leaderEntity = CutsceneGetLeader();
partnerEntity = CutsceneGetPartner();
rayquazaEntity = GetEntityFromMonsterBehavior(BEHAVIOR_RAYQUAZA);
sub_8086448();
DisplayDungeonDialogue(&gRayquazaPreFightDialogue_1);
@@ -151,7 +143,7 @@ void RayquazaReFightDialogue(void)
Entity *leaderEntity;
Entity *rayquazaEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
rayquazaEntity = GetEntityFromMonsterBehavior(BEHAVIOR_RAYQUAZA);
sub_8086448();
RayquazaScreenFlash();
@@ -175,7 +167,7 @@ void RayquazaPostStoryPreFightDialogue(void)
Entity *leaderEntity;
Entity *rayquazaEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
rayquazaEntity = GetEntityFromMonsterBehavior(BEHAVIOR_RAYQUAZA);
sub_8086448();
if (sub_8086AE4(MONSTER_RAYQUAZA)) {

21
src/dungeon_cutscene_regis.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -36,19 +35,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -148,7 +141,7 @@ void sub_808AE54(u8 param_1,u8 param_2,DungeonPos *param_3)
Item item;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
sub_8052D44(IDStack,leaderEntity,0);
if (!sub_8098100(0x22) && (param_2 == 0x2E) && (param_1 == 0x17)) {
sub_808B1CC(ITEM_NOTHING);
@@ -170,7 +163,7 @@ void sub_808AEC8(u8 param_1,u8 param_2,DungeonPos *param_3)
Item item;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
sub_8052D44(IDStack,leaderEntity,0);
if (!sub_8098100(0x22) && (param_2 == 0x2F) && (param_1 == 0x18)) {
sub_808B1CC(ITEM_NOTHING);
@@ -192,7 +185,7 @@ void sub_808AF3C(u8 param_1,u8 param_2,DungeonPos *param_3)
Item item;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
sub_8052D44(IDStack,leaderEntity,0);
if (!sub_8098100(0x22) && (param_2 == 0x30) && (param_1 == 0x19)) {
sub_808B1CC(ITEM_NOTHING);
@@ -212,7 +205,7 @@ void sub_808AFB0(u8 param_1)
Entity * leaderEntity;
s16 IDStack [2];
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
sub_8052D44(IDStack,leaderEntity,0);
if (!sub_8098100(0x22) && (param_1 == 0x2E) && (!sub_8098100(0x1d)) && (sub_80860A8(ITEM_ROCK_PART) != 0)) {
sub_8097FD0(0x1d);
@@ -230,7 +223,7 @@ void sub_808B030(u8 param_1)
Entity * leaderEntity;
s16 IDStack [2];
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
sub_8052D44(IDStack,leaderEntity,0);
if (!sub_8098100(0x22) && (param_1 == 0x2F) && (!sub_8098100(0x1d)) && (sub_80860A8(ITEM_ICE_PART) != 0)) {
sub_8097FD0(0x1d);
@@ -248,7 +241,7 @@ void sub_808B0B0(u8 param_1)
Entity * leaderEntity;
s16 IDStack [2];
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
sub_8052D44(IDStack,leaderEntity,0);
if (!sub_8098100(0x22) && (param_1 == 0x30) && (!sub_8098100(0x1d)) && (sub_80860A8(ITEM_STEEL_PART) != 0)) {
sub_8097FD0(0x1d);

22
src/dungeon_cutscene_skarmory.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -35,20 +34,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -61,7 +53,7 @@ void sub_8086B14(void)
Entity * diglettEntity;
Entity * skarmoryEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
diglettEntity = GetEntityFromMonsterBehavior(BEHAVIOR_DIGLETT);
skarmoryEntity = GetEntityFromMonsterBehavior(BEHAVIOR_SKARMORY);
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
@@ -82,7 +74,7 @@ void sub_8086B94(void)
Entity * diglettEntity;
Entity * skarmoryEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
diglettEntity = GetEntityFromMonsterBehavior(BEHAVIOR_DIGLETT);
skarmoryEntity = GetEntityFromMonsterBehavior(BEHAVIOR_SKARMORY);
@@ -111,8 +103,8 @@ void SkarmoryPreFightDialogue(void)
PixelPos pos1;
PixelPos pos2;
leaderEntity = xxx_call_GetLeader(); // Player
partnerEntity = GetPartnerEntity(); // Partner
leaderEntity = CutsceneGetLeader(); // Player
partnerEntity = CutsceneGetPartner(); // Partner
diglettEntity = GetEntityFromMonsterBehavior(BEHAVIOR_DIGLETT); // Diglett
skarmoryEntity = GetEntityFromMonsterBehavior(BEHAVIOR_SKARMORY); // Skarmory
@@ -167,7 +159,7 @@ void SkarmoryReFightDialogue(void)
Entity * skarmoryEntity;
PixelPos pos;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
skarmoryEntity = GetEntityFromMonsterBehavior(BEHAVIOR_SKARMORY);
pos.x = skarmoryEntity->pixelPos.x;
pos.y = skarmoryEntity->pixelPos.y + 0x2000;
@@ -188,7 +180,7 @@ void SkarmoryReFightDialogue(void)
void sub_8086E40(void)
{
SpriteLookAroundEffect(xxx_call_GetLeader());
SpriteLookAroundEffect(CutsceneGetLeader());
sub_803E708(10,0x46);
DisplayDungeonDialogue(&gUnknown_8100D3C);
sub_803E708(10,0x46);

14
src/dungeon_cutscene_smeargle.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -35,20 +34,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -62,7 +54,7 @@ void sub_808CBB0(void)
Entity *leaderEntity;
Entity *smeargleEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
smeargleEntity = GetEntityFromMonsterBehavior(BEHAVIOR_SMEARGLE);
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
sub_80854D4();
@@ -132,7 +124,7 @@ void sub_808CD44(void)
Entity *leaderEntity;
Entity *smeargleEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
smeargleEntity = GetEntityFromMonsterBehavior(BEHAVIOR_SMEARGLE);
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
sub_80854D4();

22
src/dungeon_cutscene_suicune.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -35,20 +34,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -61,7 +53,7 @@ void sub_808A264(void)
Entity * leaderEntity;
Entity * SuicuneEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
SuicuneEntity = GetEntityFromMonsterBehavior(BEHAVIOR_SUICUNE);
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
sub_80854D4();
@@ -78,7 +70,7 @@ void sub_808A2C0(void)
Entity * leaderEntity;
Entity * SuicuneEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
SuicuneEntity = GetEntityFromMonsterBehavior(BEHAVIOR_SUICUNE);
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
sub_80854D4();
@@ -93,7 +85,7 @@ void sub_808A308(void)
Entity * leaderEntity;
Entity * SuicuneEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
SuicuneEntity = GetEntityFromMonsterBehavior(BEHAVIOR_SUICUNE);
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
sub_80854D4();
@@ -121,7 +113,7 @@ void SuicunePreFightDialogue(void)
Entity * leaderEntity;
Entity * SuicuneEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
SuicuneEntity = GetEntityFromMonsterBehavior(BEHAVIOR_SUICUNE);
sub_8086448();
DisplayDungeonDialogue(&gSuicunePreFightDialogue_1);
@@ -149,7 +141,7 @@ void SuicuneReFightDialogue(void)
Entity * leaderEntity;
Entity * SuicuneEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
SuicuneEntity = GetEntityFromMonsterBehavior(BEHAVIOR_SUICUNE);
DisplayDungeonDialogue(&gSuicuneReFightDialogue_1);
SuicuneScreenFlash();
@@ -166,7 +158,7 @@ void SuicunePostStoryPreFightDialogue(void)
Entity * leaderEntity;
Entity * SuicuneEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
SuicuneEntity = GetEntityFromMonsterBehavior(BEHAVIOR_SUICUNE);
if (HasRecruitedMon(MONSTER_SUICUNE)) {
sub_80866C4(&gSuicunePostStoryPreFightDialogue_4);

21
src/dungeon_cutscene_zapdos.c
View File

@@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
#include "dungeon_vram.h"
#include "code_8041AD0.h"
#include "code_804267C.h"
#include "code_80861A8.h"
#include "code_806CD90.h"
#include "code_80869E4.h"
#include "constants/bg_music.h"
@@ -19,7 +19,6 @@
#include "dungeon_misc.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
@@ -36,19 +35,13 @@
extern void sub_8042B0C(Entity *);
extern u8 sub_806FD18(Entity *);
extern void sub_806FDF4(Entity *, Entity *, Entity **);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
extern void sub_8086A54(Entity *);
extern void ResetMonEntityData(EntityInfo *, u32);
extern void sub_8041888(u32);
extern u32 sub_80861F8(u32, Entity *, u32);
extern u8 sub_80860A8(u32);
extern void sub_8052D44(s16 *, Entity *, Entity *);
extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
extern void sub_8085374(void);
extern bool8 sub_8085B80(struct_8085B80 *);
extern void sub_8086A3C(Entity *pokemon);
extern void SetupBossFightHP(Entity *pokemon, s32 newHP, u16 songIndex);
extern u8 sub_8086AE4(s16 _index);
@@ -71,7 +64,7 @@ void sub_8087230(void)
Entity *leaderEntity;
Entity *zapdosEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
zapdosEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ZAPDOS);
DungeonStartNewBGM(MUS_IN_THE_DEPTHS_OF_THE_PIT);
sub_8085374();
@@ -90,7 +83,7 @@ void sub_808729C(void)
Entity *leaderEntity;
Entity *zapdosEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
zapdosEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ZAPDOS);
sub_80854D4();
sub_8085930(4);
@@ -130,8 +123,8 @@ void ZapdosPreFightDialogue(void)
Entity *zapdosEntity; // sp 0x68
struct_8085B80 auStack_48; // r8
leaderEntity = xxx_call_GetLeader();
partnerEntity = GetPartnerEntity();
leaderEntity = CutsceneGetLeader();
partnerEntity = CutsceneGetPartner();
zapdosEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ZAPDOS);
sub_8086448();
sub_803E708(10,0x46);
@@ -204,7 +197,7 @@ void ZapdosReFightDialogue(void)
Entity *leaderEntity;
Entity *zapdosEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
zapdosEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ZAPDOS);
sub_8086448();
sub_803E708(10,0x46);
@@ -229,7 +222,7 @@ void ZapdosPostStoryPreFightDialogue(void)
Entity * leaderEntity;
Entity * zapdosEntity;
leaderEntity = xxx_call_GetLeader();
leaderEntity = CutsceneGetLeader();
zapdosEntity = GetEntityFromMonsterBehavior(BEHAVIOR_ZAPDOS);
sub_8086448();
if (sub_8086AE4(MONSTER_ZAPDOS)) {

3
src/dungeon_items.c
View File

@@ -2,7 +2,6 @@
#include "globaldata.h"
#include "dungeon_items.h"
#include "code_8041AD0.h"
#include "code_80861A8.h"
#include "code_80869E4.h"
#include "dungeon_range.h"
#include "dungeon_random.h"
@@ -19,6 +18,7 @@
#include "dungeon_data.h"
#include "dungeon_pos_data.h"
#include "dungeon_spawns.h"
#include "dungeon_cutscene.h"
#include "dungeon_boss_dialogue.h"
#include "string_format.h"
#include "items.h"
@@ -30,7 +30,6 @@
#include "sprite.h"
extern void sub_80416E0(PixelPos *r0, u32, bool8);
extern void sub_80855E4(void *);
extern void sub_804178C(u32);
extern void sub_804219C(PixelPos *pos);

2
src/dungeon_menu_recruitment.c
View File

@@ -19,10 +19,10 @@
#include "text_2.h"
#include "text_3.h"
#include "dungeon_engine.h"
#include "dungeon_cutscene.h"
extern u16 GetLeaderActionId(void);
extern u8 sub_806F9BC(s32);
extern bool8 sub_80860A8(u8 id);
extern bool8 sub_806A564(s32 r0);

6
src/dungeon_message.c
View File

@@ -15,7 +15,6 @@
#include "dungeon_main.h"
#include "dungeon_music.h"
#include "dungeon_util.h"
#include "dungeon_util_1.h"
#include "exclusive_pokemon.h"
#include "file_system.h"
#include "input.h"
@@ -27,6 +26,7 @@
#include "text_2.h"
#include "text_3.h"
#include "dungeon_strings.h"
#include "dungeon_cutscene.h"
#include "dungeon_portrait_placement.h"
static EWRAM_DATA Entity *sLastLogMsgEntity = NULL;
@@ -375,8 +375,8 @@ void DisplayDungeonDialogue(const struct DungeonDialogueStruct *dialogueInfo)
MonPortraitMsg monPortrait;
s32 leaderId, partnerId, dialogueMonId;
s32 chosenMenuIndex;
Entity *leader = xxx_call_GetLeader();
Entity *partner = GetPartnerEntity();
Entity *leader = CutsceneGetLeader();
Entity *partner = CutsceneGetPartner();
MonPortraitMsg *monPortraitPtr = NULL;
if (leader != NULL) {

3
src/dungeon_misc.c
View File

@@ -4,7 +4,6 @@
#include "dungeon_music.h"
#include "structs/str_dungeon.h"
#include "dungeon_util.h"
#include "dungeon_util_1.h"
#include "file_system.h"
#include "pokemon.h"
#include "pokemon_3.h"
@@ -47,6 +46,7 @@
#include "dungeon_data.h"
#include "dungeon_tilemap.h"
#include "dungeon_engine.h"
#include "dungeon_cutscene.h"
static void EnsureCastformLoaded(void);
static void EnsureDeoxysLoaded(void);
@@ -54,7 +54,6 @@ static void EnsureDeoxysLoaded(void);
extern bool8 IsLevelResetDungeon(u8 dungeon);
extern void sub_806C264(s32 teamIndex, EntityInfo *entInfo);
extern bool8 sub_806A58C(s16 r0);
extern void sub_8084E00(Entity *entity, u8 param_2, u8 param_3);
extern void sub_8078084(Entity * pokemon);
extern void sub_808DFDC(s32 a1, DungeonMon* a2);
extern void sub_8067A80(u8 a0, s32 a1, s32 a2, Pokemon **a3);

5
src/dungeon_name_banner.c
View File

@@ -8,14 +8,13 @@
#include "cpu.h"
#include "def_filearchives.h"
#include "dungeon_info.h"
#include "dungeon_cutscene.h"
#include "file_system.h"
#include "pokemon.h"
#include "pokemon_3.h"
#include "text_1.h"
#include "text_3.h"
extern bool8 sub_80848EC(void);
EWRAM_DATA OpenedFile *gDungeonNameBannerPalette = NULL;
static EWRAM_DATA OpenedFile *gDungeonNameBannerFontFile = NULL;
static EWRAM_DATA s32 gDungeonNameBannerFont = 0;
@@ -59,7 +58,7 @@ void ShowDungeonNameBanner_Async(void)
SetBGPaletteBufferColorArray(i + 224, &((struct DungeonNamePaletteFileData *)(gDungeonNameBannerPalette->data))->pal[i]);
}
CpuClear((void *)(VRAM + 0x140), 0x1C00);
if (sub_80848EC()) {
if (ShouldShowDungeonBanner()) {
s32 currFloor = gDungeon->unk644.dungeonLocation.floor + gDungeon->startFloorId;
const u8 *dungName = GetDungeonName2(gDungeon->unk644.dungeonLocation.id);
s32 r5 = 10;

2
src/dungeon_vram.c
View File

@@ -31,6 +31,7 @@
#include "dungeon_tilemap.h"
#include "dungeon_name_banner.h"
#include "dungeon_engine.h"
#include "dungeon_cutscene.h"
#include "effect_main.h"
// File split is correct. This technical file deals with windows, advancing frames(v-blanks) and vram / pal set-up.
@@ -46,7 +47,6 @@ extern struct DungeonPalFile *gUnknown_202EC94;
extern RGB gUnknown_202ECA4[];
extern OpenedFile *gUnknown_202EC9C;
void sub_8085F78(void);
void sub_806CC10();
void sub_804522C();
void sub_8042E5C();

1
src/move_orb_effects_1.c
View File

@@ -22,7 +22,6 @@
#include "dungeon_map_access.h"
#include "dungeon_logic.h"
#include "dungeon_random.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "pokemon.h"
#include "status_checks.h"

5
src/run_dungeon.c
View File

@@ -54,6 +54,7 @@
#include "dungeon_jobs.h"
#include "dungeon_tilemap.h"
#include "dungeon_cleared_window.h"
#include "dungeon_cutscene.h"
EWRAM_INIT struct UnkStruct_203B414 *gUnknown_203B414 = NULL;
EWRAM_INIT Dungeon *gDungeon = NULL;
@@ -66,14 +67,10 @@ extern void sub_804513C(void);
extern void sub_8068F28(void);
extern void sub_806C1D8(void);
extern void IncrementThievingSuccesses(void);
extern void sub_8086130(void);
extern void sub_80847D4(void);
extern void sub_8043D60(void);
extern void sub_80840A4(void);
extern void sub_80848F0(void);
extern void IncrementAdventureFloorsExplored(void);
extern void sub_806AB2C(void);
extern void DisplayPreFightDialogue(void);
extern void sub_807E5AC(void);
extern void nullsub_16(void);
extern void sub_80521D0(void);

2
sym_ewram.txt
View File

@@ -58,7 +58,7 @@
.include "src/code_8075708.o"
.space 4
.include "src/dungeon_ai_attack.o"
.include "src/code_80848F0.o"
.include "src/dungeon_cutscene.o"
.space 4
.include "src/pokemon.o"
.include "src/items.o"