Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-09-29 13:47:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #100 from AnonymousRandomPerson/main
Some checks failed
build / build (push) Has been cancelled
Details

Browse Source 
Added some decomped functions from decomp.me scratches
This commit is contained in:
AnonymousRandomPerson
2024-12-16 23:59:57 -05:00
committed by GitHub
parent 17b5a9aead 95362d27f3
commit 680f1a29a5
15 changed files with 5144 additions and 5091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

552
asm/include/main_02034974.inc
View File

@@ -1,4 +1,280 @@
#pragma once
.public ADVENTURE_LOG_ENCOUNTERS_MONSTER_IDS
.public ADVENTURE_LOG_PTR
.public ARM9_UNKNOWN_DATA__NA_209E6BC
.public ARM9_UNKNOWN_PTR__NA_20A2C84
.public ARM9_UNKNOWN_TABLE__NA_209E12C
.public ARM9_UNKNOWN_TABLE__NA_209E164
.public ARM9_UNKNOWN_TABLE__NA_209E280
.public ARM9_UNKNOWN_TABLE__NA_20A20B0
.public AddItemToStorage
.public AddMoneyCarried
.public AllocateTemp1024ByteBufferFromPool
.public Arm9LoadUnkFieldNa0x2029EC8
.public Arm9StoreUnkFieldNa0x2029ED8
.public ArrayCopy32
.public ArrayFill32
.public BAG_CAPACITY_TABLE
.public BAG_CAPACITY_TABLE_SPECIAL_EPISODES
.public BAG_ITEMS_PTR_MIRROR
.public CLIENT_LEVEL_TABLE
.public CanMonsterUseMove
.public CardBackupError
.public CardPullOutWithStatus
.public CheckDebugMenuField0x1A4
.public CheckOptionsMenuField0x1A4
.public CheckParentMenuField0x1A0
.public ClearWindow
.public CloseAdvancedMenu
.public CloseAdvancedTextBox
.public CloseAdvancedTextBox2
.public CloseCollectionMenu
.public CloseDebugMenu
.public CloseDialogueBox
.public CloseOptionsMenu
.public CloseParentMenu
.public ClosePortraitBox
.public CloseScrollBox
.public CloseSimpleMenu
.public CloseTeamSelectionMenu
.public CloseTextBox
.public CloseTextBox2
.public ConvertStorageItemAtIdxToItem
.public CopyNStringFromId
.public CountNbOfItemsInStorage
.public CountNbOfValidItemsInStorage
.public CountNbOfValidItemsInTimeDarknessInStorage
.public CreateAdvancedMenu
.public CreateAdvancedTextBox
.public CreateAdvancedTextBoxWithArg
.public CreateCollectionMenu
.public CreateDebugMenu
.public CreateDialogueBox
.public CreateOptionsMenu
.public CreateParentMenu
.public CreateParentMenuFromStringIds
.public CreatePortraitBox
.public CreateScrollBoxMulti
.public CreateScrollBoxSingle
.public CreateSimpleMenu
.public CreateSimpleMenuFromStringIds
.public CreateTeamSelectionMenu
.public CreateTextBox
.public CreateTextBoxWithArg
.public DEFAULT_HERO_ID
.public DUNGEON_DATA_LIST
.public DUNGEON_PTR
.public DUNGEON_RESTRICTIONS
.public Debug_FatalError
.public Debug_GetDebugFlag
.public Debug_GetLogFlag
.public Debug_Print
.public Debug_Print0
.public Debug_SetDebugFlag
.public Debug_SetLogFlag
.public DecompressAtNormalVeneer
.public DexNumbersEqual
.public DirectoryFileMngr_OpenDirectoryFile
.public DisableIqSkill
.public DrawTextInWindow
.public DrawTileGrid
.public DungeonSwapIdToIdx
.public DungeonSwapIdxToId
.public DungeonToGroundMoveset
.public EnableAllLearnableIqSkills
.public FORBIDDEN_FORGOT_MOVE_LIST
.public FemaleToMaleForm
.public FileClose
.public FileRom_HandleOpen
.public FileRom_HandleRead
.public FileRom_HandleSeek
.public FileRom_InitDataTransfer
.public FileRom_StopDataTransfer
.public FileRom_Veneer_FileInit
.public FormatMoveStringMore
.public GAME_MODE
.public GLOBAL_PROGRESS_PTR
.public GUEST_MONSTER_DATA
.public GetActiveRosterIndex
.public GetActiveTeamMember
.public GetActualSellPrice
.public GetAdvancedMenuCurrentOption
.public GetAdvancedMenuResult
.public GetAdvancedTextBoxFlags2
.public GetAtSize
.public GetCurrentBagCapacity
.public GetDungeonModeSpecial
.public GetDungeonResultString
.public GetEvolutionPossibilities
.public GetHeldButtons
.public GetHero
.public GetHeroMemberIdx
.public GetInfoGroundMoveset
.public GetInfoMoveGround
.public GetIqSkillStringId
.public GetItemAtIdx
.public GetItemCategory
.public GetItemCategoryVeneer
.public GetItemIdFromList
.public GetItemMoveId16
.public GetKeyM2NSwitch
.public GetKeyN2MSwitch
.public GetLanguage
.public GetLanguageType
.public GetLearnableIqSkills
.public GetMainCharacter1MemberIdx
.public GetMainCharacter2MemberIdx
.public GetMainCharacter3MemberIdx
.public GetMaxPp
.public GetMoneyCarried
.public GetMoneyStored
.public GetMonsterName
.public GetMoveRangeId
.public GetMoveType
.public GetMovesetEggPtr
.public GetMovesetHmTmPtr
.public GetMovesetIdx__02013CAC
.public GetMovesetLevelUpPtr
.public GetNbItemsInBag
.public GetNbMoves
.public GetNextIqSkill
.public GetPartner
.public GetPartnerMemberIdx
.public GetPartyMembers
.public GetPpIncrease
.public GetPressedButtons
.public GetReleasedStylus
.public GetRngSeed
.public GetSimpleMenuResult
.public GetSosMailCount
.public GetStringFromFileVeneer
.public GetTeamMember
.public GetTime
.public GetWindow
.public GroundToDungeonMoveset
.public HIDDEN_POWER_BASE_POWER_TABLE
.public HandleSir0Translation
.public HidePortraitBox
.public InitMove
.public InitPreprocessorArgs
.public IqSkillFlagTest
.public Is2TurnsMove
.public IsAdvancedMenuActive2
.public IsAdvancedTextBoxActive
.public IsCollectionMenuActive
.public IsCollectionMenuState3
.public IsDebugMenuActive
.public IsDialogueBoxActive
.public IsExclusiveItemIdForMonster
.public IsExperienceLocked
.public IsGummi
.public IsItemInTimeDarkness
.public IsItemValidVeneer
.public IsMainCharacter
.public IsMovesetValidInTimeDarkness
.public IsNot2TurnsMoveOrSketch
.public IsOptionsMenuActive
.public IsParentMenuActive
.public IsRealMove
.public IsScrollBoxActive
.public IsShoppableItem
.public IsSimpleMenuActive
.public IsStorableItem
.public IsStorageFull
.public IsTeamSelectionMenuActive
.public IsTeamSelectionMenuState3
.public IsThrownItem
.public IsTreasureBox
.public IsValidTeamMember
.public ItemZInit
.public KAOMADO_FILEPATH
.public KEYBOARD_STRING_IDS
.public LearnMoves
.public LoadFileFromRom
.public LoadOverlay
.public MISSION_FLOORS_FORBIDDEN
.public MISSION_FLOOR_RANKS_PTRS
.public MONSTER_SPRITE_DATA
.public MemAlloc
.public MemFree
.public MemZero
.public MemcpySimple
.public MemsetSimple
.public NOTIFY_NOTE
.public NormalizeTreasureBox
.public OS_GetLockID
.public OUTLAW_LEVEL_TABLE
.public OUTLAW_MINION_LEVEL_TABLE
.public OverlayIsLoaded
.public PARTNER_TALK_KIND_TABLE
.public PORTRAIT_LAYOUTS
.public PlayAdvancedTextBoxInputSound
.public PlayBgmByIdVeneer
.public PlaySeVolumeWrapper
.public PointsToZero
.public PreprocessString
.public PreprocessStringFromId
.public RANK_UP_TABLE
.public Rand16Bit
.public Rand32Bit
.public RandInt
.public RandIntSafe
.public ReadItemsFromSave
.public ReadMonsterInfoFromSave
.public ReadStringFromDialogueBox
.public RemoveActiveMembersFromAllTeams
.public RemoveActiveMembersFromRescueTeam
.public RemoveActiveMembersFromSpecialEpisodeTeam
.public RemoveEmptyItemsInBag
.public ResumeAdvancedMenu
.public SCRIPT_VARS
.public SCRIPT_VARS_LOCALS
.public SECONDARY_TERRAIN_TYPES
.public SPECIAL_EPISODE_MAIN_CHARACTERS
.public STATUSES_FULL_DESCRIPTION_STRING_IDS
.public SetActiveInventory
.public SetActiveKecleonShop
.public SetActiveTeam
.public SetAdvancedTextBoxField0x1C2
.public SetAdvancedTextBoxPartialMenu
.public SetAdvancedTextBoxState5
.public SetBothScreensWindowsColor
.public SetCollectionMenuField0x1BC
.public SetCollectionMenuVoidFn
.public SetCollectionMenuWidth
.public SetMoneyCarried
.public SetMoneyStored
.public SetRngSeed
.public SetSimpleMenuField0x1AC
.public SetTeamSetupHeroAndPartnerOnly
.public SetUnkAdvancedTextBoxFn
.public SetUnkAdvancedTextBoxWindowFn
.public ShowDialogueBox
.public ShowPortraitInPortraitBox
.public ShowStringIdInDialogueBox
.public ShowStringInDialogueBox
.public SortItemsInBag
.public SortItemsInStorage
.public StrcpyName
.public StrcpySimple
.public StringFromId
.public StrncmpSimple
.public StrncpyName
.public StrncpySimple
.public StrncpySimpleNoPad
.public StrncpySimpleNoPadSafe
.public TEAM_MEMBER_TABLE_PTR
.public TryPointCameraToMonster
.public UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE
.public UnloadFile
.public UpdateWindow
.public VERSION_EXCLUSIVE_MONSTERS
.public WONDER_MAIL_BITS_MAP
.public WONDER_MAIL_BITS_SWAP
.public WONDER_MAIL_ENCRYPTION_TABLE
.public WriteItemsToSave
.public WriteMonsterInfoToSave
.public ZInit8
.public _0209B08C
.public _0209B09C
.public _0209B0EC
@@ -322,213 +598,7 @@
.public _f2d
.public _fsub
.public _s32_div_f
.public AddItemToStorage
.public AddMoneyCarried
.public ADVENTURE_LOG_ENCOUNTERS_MONSTER_IDS
.public ADVENTURE_LOG_PTR
.public AllocateTemp1024ByteBufferFromPool
.public ARM9_UNKNOWN_DATA__NA_209E6BC
.public ARM9_UNKNOWN_PTR__NA_20A2C84
.public ARM9_UNKNOWN_TABLE__NA_209E12C
.public ARM9_UNKNOWN_TABLE__NA_209E164
.public ARM9_UNKNOWN_TABLE__NA_209E280
.public ARM9_UNKNOWN_TABLE__NA_20A20B0
.public Arm9LoadUnkFieldNa0x2029EC8
.public Arm9StoreUnkFieldNa0x2029ED8
.public ArrayCopy32
.public ArrayFill32
.public BAG_CAPACITY_TABLE
.public BAG_CAPACITY_TABLE_SPECIAL_EPISODES
.public BAG_ITEMS_PTR_MIRROR
.public CanMonsterUseMove
.public CardBackupError
.public CardPullOutWithStatus
.public CheckDebugMenuField0x1A4
.public CheckOptionsMenuField0x1A4
.public CheckParentMenuField0x1A0
.public ClearWindow
.public CLIENT_LEVEL_TABLE
.public CloseAdvancedMenu
.public CloseAdvancedTextBox
.public CloseAdvancedTextBox2
.public CloseCollectionMenu
.public CloseDebugMenu
.public CloseDialogueBox
.public CloseOptionsMenu
.public CloseParentMenu
.public ClosePortraitBox
.public CloseScrollBox
.public CloseSimpleMenu
.public CloseTeamSelectionMenu
.public CloseTextBox
.public CloseTextBox2
.public ConvertStorageItemAtIdxToItem
.public CopyNStringFromId
.public CountNbOfItemsInStorage
.public CountNbOfValidItemsInStorage
.public CountNbOfValidItemsInTimeDarknessInStorage
.public CreateAdvancedMenu
.public CreateAdvancedTextBox
.public CreateAdvancedTextBoxWithArg
.public CreateCollectionMenu
.public CreateDebugMenu
.public CreateDialogueBox
.public CreateOptionsMenu
.public CreateParentMenu
.public CreateParentMenuFromStringIds
.public CreatePortraitBox
.public CreateScrollBoxMulti
.public CreateScrollBoxSingle
.public CreateSimpleMenu
.public CreateSimpleMenuFromStringIds
.public CreateTeamSelectionMenu
.public CreateTextBox
.public CreateTextBoxWithArg
.public Debug_FatalError
.public Debug_GetDebugFlag
.public Debug_GetLogFlag
.public Debug_Print
.public Debug_Print0
.public Debug_SetDebugFlag
.public Debug_SetLogFlag
.public DecompressAtNormalVeneer
.public DEFAULT_HERO_ID
.public DexNumbersEqual
.public DirectoryFileMngr_OpenDirectoryFile
.public DisableIqSkill
.public DrawTextInWindow
.public DrawTileGrid
.public DUNGEON_DATA_LIST
.public DUNGEON_PTR
.public DUNGEON_RESTRICTIONS
.public DungeonSwapIdToIdx
.public DungeonSwapIdxToId
.public DungeonToGroundMoveset
.public EnableAllLearnableIqSkills
.public FemaleToMaleForm
.public FileClose
.public FileRom_HandleOpen
.public FileRom_HandleRead
.public FileRom_HandleSeek
.public FileRom_InitDataTransfer
.public FileRom_StopDataTransfer
.public FileRom_Veneer_FileInit
.public FORBIDDEN_FORGOT_MOVE_LIST
.public FormatMoveStringMore
.public GAME_MODE
.public GetActiveRosterIndex
.public GetActiveTeamMember
.public GetActualSellPrice
.public GetAdvancedMenuCurrentOption
.public GetAdvancedMenuResult
.public GetAdvancedTextBoxFlags2
.public GetAtSize
.public GetCurrentBagCapacity
.public GetDungeonModeSpecial
.public GetDungeonResultString
.public GetEvolutionPossibilities
.public GetHeldButtons
.public GetHero
.public GetHeroMemberIdx
.public GetInfoGroundMoveset
.public GetInfoMoveGround
.public GetIqSkillStringId
.public GetItemAtIdx
.public GetItemCategory
.public GetItemCategoryVeneer
.public GetItemIdFromList
.public GetItemMoveId16
.public GetKeyM2NSwitch
.public GetKeyN2MSwitch
.public GetLanguage
.public GetLanguageType
.public GetLearnableIqSkills
.public GetMainCharacter1MemberIdx
.public GetMainCharacter2MemberIdx
.public GetMainCharacter3MemberIdx
.public GetMaxPp
.public GetMoneyCarried
.public GetMoneyStored
.public GetMonsterName
.public GetMoveRangeId
.public GetMovesetEggPtr
.public GetMovesetHmTmPtr
.public GetMovesetIdx__02013CAC
.public GetMovesetLevelUpPtr
.public GetMoveType
.public GetNbItemsInBag
.public GetNbMoves
.public GetNextIqSkill
.public GetPartner
.public GetPartnerMemberIdx
.public GetPartyMembers
.public GetPpIncrease
.public GetPressedButtons
.public GetReleasedStylus
.public GetRngSeed
.public GetSimpleMenuResult
.public GetSosMailCount
.public GetStringFromFileVeneer
.public GetTeamMember
.public GetTime
.public GetWindow
.public GLOBAL_PROGRESS_PTR
.public GroundToDungeonMoveset
.public GUEST_MONSTER_DATA
.public HandleSir0Translation
.public HIDDEN_POWER_BASE_POWER_TABLE
.public HidePortraitBox
.public InitMove
.public InitPreprocessorArgs
.public IqSkillFlagTest
.public Is2TurnsMove
.public IsAdvancedMenuActive2
.public IsAdvancedTextBoxActive
.public IsCollectionMenuActive
.public IsCollectionMenuState3
.public IsDebugMenuActive
.public IsDialogueBoxActive
.public IsExclusiveItemIdForMonster
.public IsExperienceLocked
.public IsGummi
.public IsItemInTimeDarkness
.public IsItemValidVeneer
.public IsMainCharacter
.public IsMovesetValidInTimeDarkness
.public IsNot2TurnsMoveOrSketch
.public IsOptionsMenuActive
.public IsParentMenuActive
.public IsRealMove
.public IsScrollBoxActive
.public IsShoppableItem
.public IsSimpleMenuActive
.public IsStorableItem
.public IsStorageFull
.public IsTeamSelectionMenuActive
.public IsTeamSelectionMenuState3
.public IsThrownItem
.public IsTreasureBox
.public IsValidTeamMember
.public ItemZInit
.public KAOMADO_FILEPATH
.public KEYBOARD_STRING_IDS
.public LearnMoves
.public LoadFileFromRom
.public LoadOverlay
.public MemAlloc
.public memcpy
.public MemcpySimple
.public MemFree
.public MemsetSimple
.public MemZero
.public MISSION_FLOOR_RANKS_PTRS
.public MISSION_FLOORS_FORBIDDEN
.public MONSTER_SPRITE_DATA
.public NormalizeTreasureBox
.public NOTIFY_NOTE
.public OS_GetLockID
.public OUTLAW_LEVEL_TABLE
.public OUTLAW_MINION_LEVEL_TABLE
.public ov11_022E6E68
.public ov11_023061CC
.public ov11_023061E4
@@ -544,70 +614,12 @@
.public ov29_022EA62C
.public ov29_023002F0
.public ov29_02347100
.public OverlayIsLoaded
.public PARTNER_TALK_KIND_TABLE
.public PlayAdvancedTextBoxInputSound
.public PlayBgmByIdVeneer
.public PlaySeVolumeWrapper
.public PointsToZero
.public PORTRAIT_LAYOUTS
.public PreprocessString
.public PreprocessStringFromId
.public Rand16Bit
.public Rand32Bit
.public RandInt
.public RandIntSafe
.public RANK_UP_TABLE
.public ReadItemsFromSave
.public ReadMonsterInfoFromSave
.public ReadStringFromDialogueBox
.public RemoveActiveMembersFromAllTeams
.public RemoveActiveMembersFromRescueTeam
.public RemoveActiveMembersFromSpecialEpisodeTeam
.public RemoveEmptyItemsInBag
.public ResumeAdvancedMenu
.public SCRIPT_VARS
.public SCRIPT_VARS_LOCALS
.public SECONDARY_TERRAIN_TYPES
.public SetActiveInventory
.public SetActiveKecleonShop
.public SetActiveTeam
.public SetAdvancedTextBoxField0x1C2
.public SetAdvancedTextBoxPartialMenu
.public SetAdvancedTextBoxState5
.public SetBothScreensWindowsColor
.public SetCollectionMenuField0x1BC
.public SetCollectionMenuVoidFn
.public SetCollectionMenuWidth
.public SetMoneyCarried
.public SetMoneyStored
.public SetRngSeed
.public SetSimpleMenuField0x1AC
.public SetTeamSetupHeroAndPartnerOnly
.public SetUnkAdvancedTextBoxFn
.public SetUnkAdvancedTextBoxWindowFn
.public ShowDialogueBox
.public ShowPortraitInPortraitBox
.public ShowStringIdInDialogueBox
.public ShowStringInDialogueBox
.public SortItemsInBag
.public SortItemsInStorage
.public SPECIAL_EPISODE_MAIN_CHARACTERS
.public sprintf
.public STATUSES_FULL_DESCRIPTION_STRING_IDS
.public strcat
.public strcpy
.public StrcpyName
.public StrcpySimple
.public StringFromId
.public strlen
.public strncmp
.public StrncmpSimple
.public strncpy
.public StrncpyName
.public StrncpySimple
.public StrncpySimpleNoPad
.public StrncpySimpleNoPadSafe
.public sub_01FF8F28
.public sub_02001808
.public sub_02002580
@@ -801,16 +813,4 @@
.public sub_02083B14
.public sub_02083B3C
.public sub_02084304
.public TEAM_MEMBER_TABLE_PTR
.public TryPointCameraToMonster
.public UnloadFile
.public UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE
.public UpdateWindow
.public VERSION_EXCLUSIVE_MONSTERS
.public vsprintf
.public WONDER_MAIL_BITS_MAP
.public WONDER_MAIL_BITS_SWAP
.public WONDER_MAIL_ENCRYPTION_TABLE
.public WriteItemsToSave
.public WriteMonsterInfoToSave
.public ZInit8

194
asm/include/overlay_29_0233861C.inc
View File

@@ -1,159 +1,89 @@
#pragma once
.public CORNER_CARDINAL_NEIGHBOR_IS_OPEN
.public ConvertWallsToChasms
.public DIRECTIONS_XY
.public DUNGEON_PTR
.public DirectoryFileMngr_OpenDirectoryFile
.public DungeonRandInt
.public DungeonRandRange
.public GenerateSecondaryTerrainFormations
.public GetFinalKecleonShopSpawnChance
.public GetFloorType
.public GetHiddenStairsType
.public GetKecleonIdToSpawnByFloor
.public GetLeader
.public GetNextFixedRoomAction
.public GetTile
.public GetTileSafe
.public GetTrapInfo
.public HIDDEN_STAIRS_SPAWN_BLOCKED
.public HandleSir0Translation
.public InitRender3dElement64
.public IsCurrentMissionType
.public IsCurrentMissionTypeExact
.public IsCurrentTilesetBackground
.public IsDestinationFloorWithMonster
.public IsExperienceLocked
.public IsGoldenChamber
.public IsHiddenStairsFloor
.public IsOutlawMonsterHouseFloor
.public IsSecretBazaar
.public LoadFixedRoomData
.public LoadWteFromFileDirectory
.public LogMessageByIdWithPopupCheckUser
.public MAP_COLOR_TABLE
.public MarkEnemySpawns
.public MarkNonEnemySpawns
.public MarkShopkeeperSpawn
.public MemZero
.public Memcpy32
.public MultiplyByFixedPoint
.public PlaceFixedRoomTile
.public PlayEffectAnimationPos
.public PosIsOutOfBounds
.public ProcessWte
.public ResetHiddenStairsSpawn
.public ResetImportantSpawnPositions
.public ResetInnerBoundaryTileRows
.public SECONDARY_TERRAIN_TYPES
.public ShouldMinimapDisplayEntity
.public StairsAlwaysReachable
.public TILESET_PROPERTIES
.public TeamMemberHasExclusiveItemEffectActive
.public UnloadFile
.public UpdateTrapsVisibility
.public _020AFC4C
.public _020AFC70
.public _s32_div_f
.public abs
.public CORNER_CARDINAL_NEIGHBOR_IS_OPEN
.public CountStickyItemsInBag
.public DetermineAllTilesWalkableNeighbors
.public DIRECTIONS_XY
.public DirectoryFileMngr_OpenDirectoryFile
.public DUNGEON_PTR
.public DungeonRand16Bit
.public DungeonRandInt
.public DungeonRandRange
.public DungeonRngSetPrimary
.public DungeonRngSetSecondary
.public EntityIsValid__02344AF8
.public FIRST_DUNGEON_WITH_MONSTER_HOUSE_TRAPS
.public FIXED_ROOM_DATA_PTR
.public FIXED_ROOM_ENTITY_SPAWN_TABLE
.public FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE
.public GenerateCleanItem
.public GenerateStandardItem
.public GetActiveTeamMember
.public GetDungeonMode
.public GetExclusiveItem
.public GetExplorerMazeMonster
.public GetFloorType
.public GetItemCategoryVeneer
.public GetKecleonIdToSpawnByFloor
.public GetLeader
.public GetMissionEnemyMinionGroup
.public GetMissionTargetEnemy
.public GetMoneyCarried
.public GetMonsterIdFromSpawnEntry
.public GetMonsterLevelToSpawn
.public GetOutlawLeaderLevel
.public GetOutlawLevel
.public GetOutlawMinionLevel
.public GetPerformanceFlagWithChecks
.public GetSpecialTargetItem
.public GetTile
.public GetTileSafe
.public GetTrapInfo
.public HandleSir0Translation
.public HIDDEN_STAIRS_SPAWN_BLOCKED
.public HIDDEN_STAIRS_SPAWN_CHANCE_MULTIPLIER
.public InitOtherMonsterData
.public InitRender3dElement64
.public InitStandardItem
.public IsBagFull
.public IsCurrentMissionType
.public IsCurrentMissionTypeExact
.public IsCurrentTilesetBackground
.public IsDestinationFloor
.public IsDestinationFloorWithMonster
.public IsExperienceLocked
.public IsFullFloorFixedRoom
.public IsGoldenChamber
.public IsItemInBag
.public IsOutlawMonsterHouseFloor
.public IsSecretBazaar
.public IsTreasureBox
.public KECLEON_SHOP_BOOST_CHANCE_MULTIPLIER
.public LoadFileFromRom
.public LoadScriptVariableValue
.public LoadWteFromFileDirectory
.public LogMessageByIdWithPopupCheckUser
.public MAP_COLOR_TABLE
.public MarkShopkeeperSpawn
.public MemAlloc
.public Memcpy32
.public MemFree
.public MemZero
.public MONSTER_HOUSE_MAX_MONSTER_SPAWNS
.public MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS
.public MultiplyByFixedPoint
.public ov10_022BFD20
.public ov10_022C4B34
.public ov10_022C6326
.public ov10_022C6C74
.public ov10_022C6C75
.public ov10_022C6C76
.public ov10_022C6C77
.public ov10_022C6C78
.public ov10_022C6C79
.public ov29_022DE288
.public ov29_022E2418
.public ov29_022E3580
.public ov29_022E6694
.public ov29_022E7BB8
.public ov29_022E7BD0
.public ov29_022E7F7C
.public ov29_022EA370
.public ov29_022EA408
.public ov29_022EFAE8
.public ov29_022EFB20
.public ov29_022EFB84
.public ov29_022F05B4
.public ov29_022F05E4
.public ov29_022F0604
.public ov29_022F0618
.public ov29_022F062C
.public ov29_022F0654
.public ov29_022F067C
.public ov29_022F0780
.public ov29_022F07BC
.public ov29_022F07D8
.public ov29_022F0848
.public ov29_023365E8
.public ov29_02336694
.public ov29_02344B9C
.public ov29_02345004
.public ov29_02348BE8
.public ov29_0234B09C
.public ov29_0234B1A4
.public ov29_0234C738
.public ov29_023502F0
.public ov29_023502F4
.public ov29_0234217C
.public ov29_02342594
.public ov29_023427E4
.public ov29_02343DC4
.public ov29_02343DD8
.public ov29_02352F1C
.public ov29_02352F40
.public ov29_02352F7C
.public ov29_02352FCC
.public ov29_02352FF4
.public ov29_02353030
.public ov29_02353050
.public ov29_02353110
.public ov29_023534F0
.public ov29_0235352C
.public ov29_0235372C
.public ov29_02353730
.public ov29_0235376C
.public ov29_0235377C
.public ov29_02353784
.public ov29_02353798
.public ov29_0237CACC
.public ov29_0237CD40
.public ov29_0237CFB8
.public ov29_0237CFBC
.public ov29_0237CFC0
.public ov29_0237CFFC
.public PlayEffectAnimationPos
.public PointsToZero
.public ProcessWte
.public SECONDARY_TERRAIN_TYPES
.public SetMonsterLevelAndId
.public SetShouldBoostHiddenStairsSpawnChance
.public SetShouldBoostKecleonShopSpawnChance
.public SHOP_ITEM_CHANCES
.public ShouldBoostHiddenStairsSpawnChance
.public ShouldBoostKecleonShopSpawnChance
.public ShouldMinimapDisplayEntity
.public SpawnEnemyTrapAtPos
.public SpawnItem
.public SpawnMonster
.public StartFadeDungeonWrapper
.public sub_020018D0
.public sub_0200A174
.public sub_0200B330
@@ -165,11 +95,3 @@
.public sub_0204AEA0
.public sub_0204AEC0
.public sub_0204AF30
.public sub_02056880
.public SubstitutePlaceholderStringTags
.public TeamMemberHasExclusiveItemEffectActive
.public TILESET_PROPERTIES
.public TREASURE_BOX_1_ITEM_IDS
.public UnloadFile
.public UpdateTrapsVisibility
.public ZInit8

122
asm/include/overlay_29_02340CE4.inc Normal file
View File

@@ -0,0 +1,122 @@
#pragma once
.public CountStickyItemsInBag
.public DUNGEON_PTR
.public DetermineAllTilesWalkableNeighbors
.public DungeonRand16Bit
.public DungeonRandInt
.public DungeonRandRange
.public DungeonRngSetPrimary
.public DungeonRngSetSecondary
.public EntityIsValid__02344AF8
.public FIRST_DUNGEON_WITH_MONSTER_HOUSE_TRAPS
.public FIXED_ROOM_DATA_PTR
.public FIXED_ROOM_ENTITY_SPAWN_TABLE
.public FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE
.public GenerateCleanItem
.public GenerateStandardItem
.public GetActiveTeamMember
.public GetDungeonMode
.public GetExclusiveItem
.public GetExplorerMazeMonster
.public GetFloorType
.public GetItemCategoryVeneer
.public GetMissionEnemyMinionGroup
.public GetMissionTargetEnemy
.public GetMoneyCarried
.public GetMonsterIdFromSpawnEntry
.public GetMonsterLevelToSpawn
.public GetOutlawLeaderLevel
.public GetOutlawLevel
.public GetOutlawMinionLevel
.public GetPerformanceFlagWithChecks
.public GetSpecialTargetItem
.public GetTile
.public GetTileSafe
.public HIDDEN_STAIRS_SPAWN_BLOCKED
.public HIDDEN_STAIRS_SPAWN_CHANCE_MULTIPLIER
.public HandleSir0Translation
.public InitOtherMonsterData
.public InitStandardItem
.public InitializeTile
.public IsBagFull
.public IsCurrentMissionType
.public IsDestinationFloor
.public IsFullFloorFixedRoom
.public IsGoldenChamber
.public IsItemInBag
.public IsSecretBazaar
.public IsSecretRoom
.public IsTreasureBox
.public KECLEON_SHOP_BOOST_CHANCE_MULTIPLIER
.public LoadFileFromRom
.public LoadScriptVariableValue
.public LogMessageByIdWithPopupCheckUser
.public MONSTER_HOUSE_MAX_MONSTER_SPAWNS
.public MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS
.public MemAlloc
.public MemFree
.public MemZero
.public MultiplyByFixedPoint
.public PointsToZero
.public PosIsOutOfBounds
.public SHOP_ITEM_CHANCES
.public SetMonsterLevelAndId
.public SetShouldBoostHiddenStairsSpawnChance
.public SetShouldBoostKecleonShopSpawnChance
.public ShouldBoostHiddenStairsSpawnChance
.public ShouldBoostKecleonShopSpawnChance
.public SpawnEnemyTrapAtPos
.public SpawnItem
.public SpawnMonster
.public StartFadeDungeonWrapper
.public SubstitutePlaceholderStringTags
.public TREASURE_BOX_1_ITEM_IDS
.public UnloadFile
.public UpdateMinimap
.public UpdateTrapsVisibility
.public ZInit8
.public _s32_div_f
.public abs
.public ov10_022C4B34
.public ov10_022C6C74
.public ov10_022C6C75
.public ov10_022C6C76
.public ov10_022C6C77
.public ov10_022C6C78
.public ov10_022C6C79
.public ov29_022E6694
.public ov29_022E7BB8
.public ov29_022E7BD0
.public ov29_022EA370
.public ov29_022EFB20
.public ov29_022EFB84
.public ov29_022F05B4
.public ov29_022F05E4
.public ov29_022F0604
.public ov29_022F0618
.public ov29_022F062C
.public ov29_022F0654
.public ov29_022F067C
.public ov29_022F0780
.public ov29_022F07BC
.public ov29_022F07D8
.public ov29_022F0848
.public ov29_023365E8
.public ov29_02336694
.public ov29_02344B9C
.public ov29_02345004
.public ov29_02348BE8
.public ov29_0234B09C
.public ov29_0234B1A4
.public ov29_0234C738
.public ov29_023502F0
.public ov29_023502F4
.public ov29_02353030
.public ov29_02353050
.public ov29_02353110
.public ov29_023534F0
.public ov29_02353798
.public ov29_0237CFBC
.public ov29_0237CFC0
.public ov29_0237CFFC
.public sub_02056880

2
asm/main_02000DE0.s
View File

@@ -1942,7 +1942,7 @@ _020025F0: .word _0229AFC0
_020025F4: .word _0229AFE4
arm_func_end sub_02002580
; https://decomp.me/scratch/mYHOs
; https://decomp.me/scratch/Gairr
arm_func_start sub_020025F8
sub_020025F8: ; 0x020025F8
stmdb sp!, {r4, lr}

2
asm/main_020082C4.s
View File

@@ -3389,7 +3389,7 @@ _0200AE30:
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
arm_func_end sub_0200ACB0
; https://decomp.me/scratch/VDRBP
; https://decomp.me/scratch/xdMiD
arm_func_start TransformPaletteDataWithFlushDivideFade
TransformPaletteDataWithFlushDivideFade: ; 0x0200AE38
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}

21
asm/main_02034974.s
View File

@@ -40977,6 +40977,7 @@ _02054B6C: .word 0x000001CD
_02054B70: .word 0xFFFFFBDC
arm_func_end IsCherrim
; https://decomp.me/scratch/IvDKt
arm_func_start IsDeoxys
IsDeoxys: ; 0x02054B74
ldr r1, _02054BA0 ; =0xFFFFFE5E
@@ -40993,23 +40994,3 @@ IsDeoxys: ; 0x02054B74
.align 2, 0
_02054BA0: .word 0xFFFFFE5E
arm_func_end IsDeoxys
arm_func_start GetSecondFormIfValid
GetSecondFormIfValid: ; 0x02054BA4
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
bl GetMonsterGender
cmp r0, #1
bne _02054BD8
add r4, r5, #0x258
mov r0, r4, lsl #0x10
mov r0, r0, asr #0x10
bl GetMonsterGender
cmp r0, #2
moveq r0, r4, lsl #0x10
moveq r0, r0, asr #0x10
ldmeqia sp!, {r3, r4, r5, pc}
_02054BD8:
mov r0, r5
ldmia sp!, {r3, r4, r5, pc}
arm_func_end GetSecondFormIfValid

4652
asm/overlay_29_0233861C.s
View File

File diff suppressed because it is too large Load Diff

4638
asm/overlay_29_02340CE4.s Normal file
View File

File diff suppressed because it is too large Load Diff

2
include/dungeon.h
View File

@@ -6,6 +6,8 @@
#define MAX_TEAM_MEMBERS 4
#define DUNGEON_MAX_POKEMON 20
#define DUNGEON_MAX_SIZE_X 56
#define DUNGEON_MAX_SIZE_Y 32
// Dungeon state
struct dungeon {

4
include/enums.h
View File

@@ -2599,9 +2599,11 @@ enum shopkeeper_mode {
SHOPKEEPER_MODE_ATTACK_TEAM = 3,
};
#define MONSTER_GENDER_ID_OFFSET 600
// Some macro shenanigans to define the monster secondary gender labels neatly.
#define _MONSTER_ID_GENDERED(name, base_value) \
MONSTER_##name = base_value, MONSTER_##name##_SECONDARY = base_value + 600
MONSTER_##name = base_value, MONSTER_##name##_SECONDARY = base_value + MONSTER_GENDER_ID_OFFSET
// Monster ID. Add 600 to the base value to get secondary genders (typically female).
enum monster_id {

2
include/main_02054BE0.h
View File

@@ -1,8 +1,8 @@
#ifndef PMDSKY_MAIN_02054BE0_H
#define PMDSKY_MAIN_02054BE0_H
s16 GetSecondFormIfValid(s16 id);
// Returns the ID of the first form of the specified monster if the specified ID corresponds to a secondary form with female gender and the first form has male gender. If those conditions don't meet, returns the same ID unchanged.
// monster_id: Monster ID
// return: ID of the male form of the monster if the requirements meet, same ID otherwise.
s16 FemaleToMaleForm(s16 monster_id);

9
include/overlay_29_02340CAC.h Normal file
View File

@@ -0,0 +1,9 @@
#ifndef PMDSKY_OVERLAY_29_02340CAC_H
#define PMDSKY_OVERLAY_29_02340CAC_H
#include "util.h"
// Checks if a position (x, y) is out of bounds on the map: !((0 <= x <= 55) && (0 <= y <= 31)).
bool8 PosIsOutOfBounds(s32 x, s32 y);
#endif //PMDSKY_OVERLAY_29_02340CAC_H

2
main.lsf
View File

@@ -364,6 +364,8 @@ Overlay OVY_29
Object asm/overlay_29_02338560.o
Object src/overlay_29_02338604.o
Object asm/overlay_29_0233861C.o
Object src/overlay_29_02340CAC.o
Object asm/overlay_29_02340CE4.o
Object src/overlay_29_02344AF8.o
Object asm/overlay_29_02344B1C.o
Object src/overlay_29_02345698.o

18
src/main_02054BE0.c
View File

@@ -1,16 +1,28 @@
#include "main_02054BE0.h"
#include "enums.h"
extern s16 GetMonsterGender(s16 monster_id);
s16 GetSecondFormIfValid(s16 id)
{
s16 ret = GetMonsterGender(id);
if (ret == 1)
{
if (GetMonsterGender(id + MONSTER_GENDER_ID_OFFSET) == 2)
return id + MONSTER_GENDER_ID_OFFSET;
}
return id;
}
s16 FemaleToMaleForm(s16 monster_id)
{
s16 gender = GetMonsterGender(monster_id);
if (gender == 2 && monster_id >= 600)
if (gender == 2 && monster_id >= MONSTER_GENDER_ID_OFFSET)
{
s16 gender = GetMonsterGender(monster_id - 600);
s16 gender = GetMonsterGender(monster_id - MONSTER_GENDER_ID_OFFSET);
if (gender == 1)
{
return monster_id - 600;
return monster_id - MONSTER_GENDER_ID_OFFSET;
}
}
return monster_id;

15
src/overlay_29_02340CAC.c Normal file
View File

@@ -0,0 +1,15 @@
#include "overlay_29_02340CAC.h"
#include "dungeon.h"
bool8 PosIsOutOfBounds(s32 x, s32 y)
{
if (x < 0)
return TRUE;
if (y < 0)
return TRUE;
if (DUNGEON_MAX_SIZE_X <= x)
return TRUE;
if (DUNGEON_MAX_SIZE_Y <= y)
return TRUE;
return FALSE;
}