Decomped IsCurrentFixedRoomBossFight

This commit is contained in:
AnonymousRandomPerson 2025-07-17 22:43:58 -04:00
parent a722fd1611
commit 77fcb267eb
14 changed files with 1259 additions and 1244 deletions

View File

@ -1,82 +1,26 @@
#pragma once
.public _020AFC28
.public _020AFC4C
.public _020AFC70
.public AnimationDelayOrSomething
.public CalcSpeedStageWrapper
.public CopyAndInterleaveWrapper
.public DirectoryFileMngr_OpenDirectoryFile
.public DisplayMessage2
.public DUNGEON_PTR
.public DungeonGoesUp
.public DisplayMessage2
.public EntityIsValid__022E0354
.public GetBgRegionArea
.public FixedRoomIsSubstituteRoom
.public GetForcedLossReason
.public GetHeldButtons
.public GetLeader
.public GetMaxItemsAllowed
.public GetMaxPpWrapper
.public GetPressedButtons
.public GetReleasedStylus
.public GetScenarioBalance
.public GetTileSafe
.public GetTrapInfo
.public HandleFaint
.public HandleSir0Translation
.public IsCurrentTilesetBackground
.public IsExperienceLocked
.public IsFloorOver
.public IsJirachiChallengeFloor
.public IsMoneyAllowed
.public LoadTextureUi
.public LoadWteFromFileDirectory
.public Memcpy32
.public Memset32
.public ov10_022C4D54
.public ov29_022DE15C
.public ov29_022DE854
.public ov29_022E34B0
.public ov29_022E68BC
.public ov29_022E8778
.public ov29_022E8BFC
.public ov29_022E9FD0
.public ov29_022EA370
.public ov29_02335760
.public ov29_02335774
.public ov29_02335804
.public ov29_0233A248
.public ov29_0234B034
.public ov29_0234B0B4
.public ov29_0234B1A4
.public ov29_0234C738
.public ov29_023510E0
.public ov29_02353540
.public ov29_02353544
.public ov29_0237C694
.public ov29_0237C696
.public ov29_0237C698
.public ov29_0237C6A4
.public ov29_0237C6B8
.public ov29_0237C6D4
.public ov29_0237CFC0
.public RemoveAllItems
.public SECONDARY_TERRAIN_TYPES
.public SetMinimapDataE447
.public SetMoneyCarried
.public StartFadeDungeonWrapper
.public sub_020063F4
.public sub_02006564
.public sub_02006BFC
.public sub_02008F3C
.public sub_020090A0
.public sub_02009194
.public sub_020091B0
.public sub_020091CC
.public sub_02009454
.public sub_020094C4
.public sub_0201B43C
.public sub_0201E380
.public sub_0201F598
.public sub_0204AE80
.public SubInitMonster
.public UnloadFile
.public UnloadWte
.public ov29_022E0A18
.public ov29_022E68BC
.public ov29_0234B034
.public ov29_0234B0B4
.public ov29_0237CFC0

View File

@ -0,0 +1,62 @@
#pragma once
.public AnimationDelayOrSomething
.public CopyAndInterleaveWrapper
.public DUNGEON_PTR
.public DirectoryFileMngr_OpenDirectoryFile
.public DungeonGoesUp
.public GetBgRegionArea
.public GetFloorType
.public GetHeldButtons
.public GetPressedButtons
.public GetReleasedStylus
.public GetScenarioBalance
.public HandleSir0Translation
.public IsCurrentTilesetBackground
.public LoadTextureUi
.public LoadWteFromFileDirectory
.public Memcpy32
.public Memset32
.public SetMinimapDataE447
.public StartFadeDungeonWrapper
.public UnloadFile
.public UnloadWte
.public _020AFC28
.public _020AFC4C
.public _020AFC70
.public ov10_022C4D54
.public ov29_022DE15C
.public ov29_022DE854
.public ov29_022E34B0
.public ov29_022E8778
.public ov29_022E8BFC
.public ov29_022E9FD0
.public ov29_022EA370
.public ov29_02335760
.public ov29_02335774
.public ov29_02335804
.public ov29_0233A248
.public ov29_0234B1A4
.public ov29_0234C738
.public ov29_023510E0
.public ov29_02353540
.public ov29_02353544
.public ov29_0237C694
.public ov29_0237C696
.public ov29_0237C698
.public ov29_0237C6A4
.public ov29_0237C6B8
.public ov29_0237C6D4
.public sub_020063F4
.public sub_02006564
.public sub_02006BFC
.public sub_02008F3C
.public sub_020090A0
.public sub_02009194
.public sub_020091B0
.public sub_020091CC
.public sub_02009454
.public sub_020094C4
.public sub_0201B43C
.public sub_0201E380
.public sub_0201F598
.public sub_0204AE80

File diff suppressed because it is too large Load Diff

1160
asm/overlay_29_022E08A0.s Normal file

File diff suppressed because it is too large Load Diff

8
include/run_dungeon_1.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef PMDSKY_RUN_DUNGEON_1_H
#define PMDSKY_RUN_DUNGEON_1_H
#include "util.h"
bool8 IsCurrentFixedRoomBossFight();
#endif //PMDSKY_RUN_DUNGEON_1_H

View File

@ -283,6 +283,8 @@ Overlay OVY_29
Object asm/overlay_29_022DEBA4.o
Object src/dg.o
Object asm/overlay_29_022E0378.o
Object src/run_dungeon_1.o
Object asm/overlay_29_022E08A0.o
Object src/overlay_29_022E1610.o
Object asm/overlay_29_022E1618.o
Object src/dg_object.o

View File

@ -2,7 +2,7 @@
#include "dungeon.h"
extern struct tile* DEFAULT_TILE;
extern struct dungeon* DUNGEON_PTR[];
extern struct dungeon *DUNGEON_PTR[];
struct tile* GetTile(s32 x, s32 y)
{

View File

@ -4,7 +4,7 @@
#include "overlay_29_023000E4.h"
#include "pokemon.h"
extern struct dungeon* DUNGEON_PTR[];
extern struct dungeon *DUNGEON_PTR[];
bool8 CanSeeInvisibleMonsters(struct entity *entity)
{

View File

@ -8,7 +8,7 @@
#include "tileset.h"
#include "weather.h"
extern struct dungeon* DUNGEON_PTR[];
extern struct dungeon *DUNGEON_PTR[];
extern bool8 IsCurrentFixedRoomBossFight();
extern bool8 CanLayTrap(struct position *pos);

View File

@ -1,6 +1,6 @@
#include "overlay_29_022DEAB0.h"
extern struct dungeon* DUNGEON_PTR[];
extern struct dungeon *DUNGEON_PTR[];
void MemFree(void* ptr);
void MemZero(void* ptr, u32 len);

View File

@ -2,7 +2,7 @@
#include "dungeon.h"
extern struct dungeon* DUNGEON_PTR[];
extern struct dungeon *DUNGEON_PTR[];
bool8 TeamMemberHasExclusiveItemEffectActive(u8);
bool8 ShouldBoostKecleonShopSpawnChance(void)

View File

@ -2,7 +2,7 @@
#include "dungeon.h"
extern struct dungeon* DUNGEON_PTR[];
extern struct dungeon *DUNGEON_PTR[];
bool8 IsSecretBazaar()
{

View File

@ -2,7 +2,7 @@
#include "dungeon_ai_targeting.h"
#include "number_util.h"
extern struct dungeon* DUNGEON_PTR[];
extern struct dungeon *DUNGEON_PTR[];
extern const u8 DUNGEON_MENU_SWITCH_STR1[];// = "[dungeon:0]";

12
src/run_dungeon_1.c Normal file
View File

@ -0,0 +1,12 @@
#include "run_dungeon_1.h"
#include "dungeon.h"
#include "enums.h"
extern struct dungeon *DUNGEON_PTR[];
extern bool8 IsBossFight(enum fixed_room_id fixed_room_id);
bool8 IsCurrentFixedRoomBossFight()
{
IsBossFight(DUNGEON_PTR[0]->gen_info.fixed_room_id);
}