Decomped IsExperienceLocked

This commit is contained in:
AnonymousRandomPerson 2024-11-22 23:08:04 -05:00
parent dd2bf7ca6b
commit 098e58a424
7 changed files with 1296 additions and 1267 deletions

View File

@ -1,6 +1,4 @@
#pragma once
.public _020A1870
.public _s32_div_f
.public AbilityIsActiveVeneer
.public AdvanceFrame
.public AiMovement
@ -8,31 +6,28 @@
.public ApplyItemEffect
.public BAG_ITEMS_PTR_MIRROR
.public BELLY_DRAIN_IN_WALLS_INT
.public CASTFORM_WEATHER_ATTRIBUTE_TABLE
.public CanAttackInDirection
.public CanMonsterSpawn
.public CanMonsterUseItem
.public CanSeeTarget
.public CASTFORM_WEATHER_ATTRIBUTE_TABLE
.public CeilFixedPoint
.public ChangeMonsterAnimation
.public CheckTeamMemberIdx
.public CheckVariousStatuses
.public CheckVariousStatuses2
.public Conversion2IsActive
.public CopySpawnEntriesMaster
.public DIRECTIONS_XY
.public DUNGEON_PTR
.public DeleteWanTableEntryVeneer
.public DetermineMonsterShadow
.public DIRECTIONS_XY
.public DirectoryFileMngr_GetDirectoryFileSize
.public DiscoverMinimap
.public DisplayAnimatedNumbers
.public DisplayMessage
.public DisplayMessage2
.public DrawMinimapTile
.public DUNGEON_PTR
.public DungeonRandInt
.public DungeonRngSetPrimary
.public DungeonRngSetSecondary
.public EnableAllLearnableIqSkills
.public EnableIqSkill
.public EndBurnClassStatus
@ -41,9 +36,7 @@
.public EndReflectClassStatus
.public EndSleepClassStatus
.public EntityIsValid__022F7364
.public EntityIsValid__022FC99C
.public ExclusiveItemEffectFlagTest
.public FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE
.public FreeOtherWrappedMonsters
.public GendersEqualNotGenderless
.public GetAbility
@ -52,36 +45,26 @@
.public GetBodySize
.public GetChebyshevDistance
.public GetConversion2ConvertToType
.public GetDefensiveStatAtLevel
.public GetDirectionTowardsPosition
.public GetExclusiveItemWithEffectFromBag
.public GetExp
.public GetExplorerMazeMonster
.public GetFloorType
.public GetForcedLossReason
.public GetIdleAnimationId
.public GetLeader
.public GetLearnableIqSkills
.public GetLvlUpEntry
.public GetMaxHpAtLevel
.public GetMaxPp
.public GetMaxPpWrapper
.public GetMinimapData
.public GetMinimapDataE447
.public GetMobilityType
.public GetMonsterEvoStatus
.public GetMonsterGender
.public GetMonsterIdFromSpawnEntry
.public GetMonsterLevelFromSpawnEntry
.public GetMonsterMoves
.public GetMonsterName
.public GetMoveBasePp
.public GetMoveType
.public GetMoveTypeForMonster
.public GetNbItemsInBag
.public GetNumberOfAttacks
.public GetOffensiveStatAtLevel
.public GetOutlawSpawnData
.public GetScenarioBalance
.public GetScenarioBalanceVeneer
.public GetSpawnThreshold
@ -94,23 +77,14 @@
.public GetTileAtEntity
.public GetTileSafe
.public GetTreatmentBetweenMonsters
.public GetTurnLimit
.public GetType
.public GetTypeMatchupBothTypes
.public GroundToDungeonMoveset
.public HasHeldItem
.public HasMaxGinsengBoost99
.public InitAnimationControlWithSet__0201C0CC
.public InitMoveCheckId
.public InitTeamMember
.public IQ_SKILLS
.public IqSkillIsEnabled
.public IsCurrentFixedRoomBossFight
.public IsCurrentMissionType
.public IsDestinationFloorWithFixedRoom
.public IsDestinationFloorWithMonster
.public IsFullFloorFixedRoom
.public IsInvalidSpawnTile
.public IsLevelResetDungeon
.public IsMonsterIdInNormalRange
.public IsMonsterSleeping
@ -126,7 +100,6 @@
.public LEADER_PTR
.public LoadWanTableEntryFromPack
.public LoadWanTableEntryFromPackUseProvidedMemory
.public LoadWazaP2
.public LogMessageByIdWithPopup
.public LogMessageByIdWithPopupCheckUser
.public LogMessageByIdWithPopupCheckUserTarget
@ -135,9 +108,38 @@
.public MemFree
.public MonsterIsType
.public OpenMessageLog
.public PointCameraToMonster
.public PopulateActiveMonsterPtrs
.public RandInt
.public RemoveEquivItem
.public RemoveHolderForItemInBag
.public ReplaceWanFromBinFile
.public RestoreAllMovePP
.public SECONDARY_TERRAIN_TYPES
.public SetActionPassTurnOrWalk
.public SetForcedLossReason
.public SetMissionTargetEnemyDefeated
.public ShouldDisplayEntityWrapper
.public ShouldMonsterRunAway
.public ShouldTryEatItem
.public ShowPpRestoreEffect
.public StoryRestrictionsEnabled
.public SubFixedPoint
.public SubstitutePlaceholderStringTags
.public TEAM_MEMBER_TABLE_PTR
.public TryIncreaseHp
.public TryInflictBurnStatus
.public TryInflictPausedStatus
.public UpdateCamera
.public UpdateMapSurveyorFlag
.public UpdateMinimap
.public UpdateStatusIconFlags
.public WAN_TABLE
.public WEATHER_BALL_TYPE_TABLE
.public YesNoMenu
.public _020A1870
.public ov10_022C4C6E
.public ov10_022C4C70
.public ov29_022DDA54
.public ov29_022DDB68
.public ov29_022E0A04
.public ov29_022E1C0C
@ -157,13 +159,11 @@
.public ov29_022EF7C4
.public ov29_022EF938
.public ov29_022EFAE8
.public ov29_022FCD04
.public ov29_022FE048
.public ov29_022FFB90
.public ov29_0230040C
.public ov29_023018AC
.public ov29_023021F0
.public ov29_02304830
.public ov29_02304A48
.public ov29_02307CE0
.public ov29_02307DD0
@ -184,27 +184,7 @@
.public ov29_0234B1A4
.public ov29_0234EF24
.public ov29_0235171E
.public ov29_02351E28
.public ov29_0237C9B0
.public PointCameraToMonster
.public PopulateActiveMonsterPtrs
.public RandInt
.public RemoveEquivItem
.public RemoveHolderForItemInBag
.public ReplaceWanFromBinFile
.public RestoreAllMovePP
.public SECONDARY_TERRAIN_TYPES
.public SetActionPassTurnOrWalk
.public SetForcedLossReason
.public SetMissionTargetEnemyDefeated
.public SetMonsterLevelAndId
.public SetSpriteIdForAnimationControl
.public ShouldDisplayEntityWrapper
.public ShouldMonsterRunAway
.public ShouldTryEatItem
.public ShowPpRestoreEffect
.public StoryRestrictionsEnabled
.public sub_0200F9B4
.public sub_0201405C
.public sub_02017C50
.public sub_0204AEF0
@ -216,17 +196,3 @@
.public sub_020566C4
.public sub_020585B4
.public sub_02058674
.public SubFixedPoint
.public SubstitutePlaceholderStringTags
.public TEAM_MEMBER_TABLE_PTR
.public TryIncreaseHp
.public TryInflictBurnStatus
.public TryInflictPausedStatus
.public UnloadCurrentWazaP
.public UpdateCamera
.public UpdateMapSurveyorFlag
.public UpdateMinimap
.public UpdateStatusIconFlags
.public WAN_TABLE
.public WEATHER_BALL_TYPE_TABLE
.public YesNoMenu

View File

@ -0,0 +1,50 @@
#pragma once
.public CopySpawnEntriesMaster
.public DUNGEON_PTR
.public DungeonRngSetPrimary
.public DungeonRngSetSecondary
.public EnableAllLearnableIqSkills
.public EntityIsValid__022F7364
.public EntityIsValid__022FC99C
.public FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE
.public GetActiveTeamMember
.public GetBodySize
.public GetDefensiveStatAtLevel
.public GetExp
.public GetExplorerMazeMonster
.public GetIdleAnimationId
.public GetMaxHpAtLevel
.public GetMonsterIdFromSpawnEntry
.public GetMonsterLevelFromSpawnEntry
.public GetMonsterMoves
.public GetOffensiveStatAtLevel
.public GetOutlawSpawnData
.public GetTile
.public GetTileSafe
.public GetTurnLimit
.public GroundToDungeonMoveset
.public IQ_SKILLS
.public InitAnimationControlWithSet__0201C0CC
.public InitMoveCheckId
.public InitTeamMember
.public IsCurrentMissionType
.public IsDestinationFloorWithFixedRoom
.public IsDestinationFloorWithMonster
.public IsFullFloorFixedRoom
.public IsInvalidSpawnTile
.public IsMonster__022F9720
.public IsSecretBazaarNpcBehavior
.public JoinedAtRangeCheck2Veneer
.public LoadWazaP2
.public SetMonsterLevelAndId
.public SetSpriteIdForAnimationControl
.public UnloadCurrentWazaP
.public _s32_div_f
.public ov29_022DDA54
.public ov29_022EFAE8
.public ov29_022FB83C
.public ov29_022FCD04
.public ov29_023021F0
.public ov29_02304830
.public ov29_02351E28
.public sub_0200F9B4

File diff suppressed because it is too large Load Diff

1189
asm/overlay_29_022FBB1C.s Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,8 @@
#ifndef PMDSKY_OVERLAY_29_022FBAF0_H
#define PMDSKY_OVERLAY_29_022FBAF0_H
#include "dungeon_mode.h"
bool8 IsExperienceLocked(struct monster *pokemon_info);
#endif //PMDSKY_OVERLAY_29_022FBAF0_H

View File

@ -246,6 +246,8 @@ Overlay OVY_29
Object asm/overlay_29_022F62CC.o
Object src/overlay_29_022F7364.o
Object asm/overlay_29_022F7388.o
Object src/overlay_29_022FBAF0.o
Object asm/overlay_29_022FBB1C.o
Object src/overlay_29_022FC99C.o
Object asm/overlay_29_022FC9C0.o
Object src/overlay_29_022FEEB8_eu.o

14
src/overlay_29_022FBAF0.c Normal file
View File

@ -0,0 +1,14 @@
#include "overlay_29_022FBAF0.h"
bool8 IsSpecialStoryAlly(struct monster *pokemon_info);
bool8 IsExperienceLocked(struct monster *pokemon_info)
{
if (pokemon_info->joined_at == DUNGEON_CLIENT)
return TRUE;
if (IsSpecialStoryAlly(pokemon_info))
return TRUE;
return FALSE;
}