Skip to content

Commit

Permalink
Merge pull request #100 from AnonymousRandomPerson/main
Browse files Browse the repository at this point in the history 
Added some decomped functions from decomp.me scratches
  • Loading branch information
@AnonymousRandomPerson
AnonymousRandomPerson authored Dec 17, 2024
2 parents 17b5a9a + 95362d2 commit 680f1a2
Show file tree
Hide file tree
Showing 15 changed files with 5,263 additions and 5,210 deletions.
836 changes: 418 additions & 418 deletions asm/include/main_02034974.inc
View file

Large diffs are not rendered by default.

148 changes: 35 additions & 113 deletions asm/include/overlay_29_0233861C.inc
View file
Original file line number Diff line number Diff line change
@@ -1,159 +1,89 @@
#pragma once
.public _020AFC4C
.public _020AFC70
.public _s32_div_f
.public abs
.public CORNER_CARDINAL_NEIGHBOR_IS_OPEN
.public CountStickyItemsInBag
.public DetermineAllTilesWalkableNeighbors
.public ConvertWallsToChasms
.public DIRECTIONS_XY
.public DirectoryFileMngr_OpenDirectoryFile
.public DUNGEON_PTR
.public DungeonRand16Bit
.public DirectoryFileMngr_OpenDirectoryFile
.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 GenerateSecondaryTerrainFormations
.public GetFinalKecleonShopSpawnChance
.public GetFloorType
.public GetItemCategoryVeneer
.public GetHiddenStairsType
.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 GetNextFixedRoomAction
.public GetTile
.public GetTileSafe
.public GetTrapInfo
.public HandleSir0Translation
.public HIDDEN_STAIRS_SPAWN_BLOCKED
.public HIDDEN_STAIRS_SPAWN_CHANCE_MULTIPLIER
.public InitOtherMonsterData
.public HandleSir0Translation
.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 IsHiddenStairsFloor
.public IsOutlawMonsterHouseFloor
.public IsSecretBazaar
.public IsTreasureBox
.public KECLEON_SHOP_BOOST_CHANCE_MULTIPLIER
.public LoadFileFromRom
.public LoadScriptVariableValue
.public LoadFixedRoomData
.public LoadWteFromFileDirectory
.public LogMessageByIdWithPopupCheckUser
.public MAP_COLOR_TABLE
.public MarkEnemySpawns
.public MarkNonEnemySpawns
.public MarkShopkeeperSpawn
.public MemAlloc
.public Memcpy32
.public MemFree
.public MemZero
.public MONSTER_HOUSE_MAX_MONSTER_SPAWNS
.public MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS
.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 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
Expand All @@ -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 changes: 122 additions & 0 deletions asm/include/overlay_29_02340CE4.inc
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion asm/main_02000DE0.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion asm/main_020082C4.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
21 changes: 1 addition & 20 deletions asm/main_02034974.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Loading

0 comments on commit 680f1a2

Please sign in to comment.