Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-09-30 22:27:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Synced from pmdsky-debug

Browse Source
This commit is contained in:
AnonymousRandomPerson
2023-10-31 21:24:37 -04:00
parent 89de364b18
commit b9699c04ad
8 changed files with 464 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
asm/include/main_02000C6C.inc
View File

@@ -187,11 +187,15 @@
.public DecompressAtFromMemoryPointer
.public FatalError
.public FileInit
.public GetOverlayInfo
.public InitDebug
.public InitOverlay
.public LOADED_OVERLAY_GROUP_0
.public LoadOverlayInternal
.public MainLoop
.public MEMORY_ALLOCATION_ARENA_GETTERS
.public NATURAL_LOG_VALUE_TABLE
.public OS_IRQTable
.public PRNG_SEQUENCE_NUM
.public sprintf
.public sqrtf
@@ -310,9 +314,6 @@
.public sub_0207F70C
.public sub_0207F818
.public sub_0207F828
.public sub_0207FC9C
.public sub_0207FD98
.public sub_0207FEBC
.public sub_020800B0
.public sub_020811EC
.public sub_02081264
@@ -335,4 +336,3 @@
.public sub_02085180
.public vsprintf
.public WaitForInterrupt
.public OS_IRQTable

4
asm/include/overlay_17.inc
View File

@@ -21,8 +21,8 @@
.public IsNormalMenuActive
.public MemAlloc
.public MemFree
.public ov11_022E6E68
.public ov11_022DC504
.public ov11_022E6E68
.public ov11_0238A08C
.public PrintIqSkillsMenu
.public SetPortraitEmotion
@@ -81,7 +81,6 @@
.public sub_020564B0
.public sub_02056554
.public sub_020566C4
.public sub_02056754
.public sub_02056F60
.public sub_02057180
.public sub_020572EC
@@ -89,3 +88,4 @@
.public sub_02058138
.public sub_0205B028
.public TEAM_MEMBER_TABLE_PTR
.public TryAddMonsterToActiveTeam

10
asm/include/overlay_29_022F05B4.inc
View File

@@ -1,6 +1,5 @@
#pragma once
.public __divsi3
.public BAG_ITEMS_PTR_MIRROR
.public _020AFC4C
.public abs
.public AddHeldItemToBag
@@ -9,6 +8,7 @@
.public AddMoneyCarried
.public AdvanceFrame
.public AnimationDelayOrSomething
.public BAG_ITEMS_PTR_MIRROR
.public CanMonsterMoveInDirection
.public CanSeeTarget
.public CeilFixedPoint
@@ -24,7 +24,6 @@
.public GetDirectionTowardsPosition
.public GetEntityMoveTargetAndRange
.public GetEquippedThrowableItem
.public GetMoneyCarried
.public GetHero
.public GetItemCategoryVeneer
.public GetItemIndex
@@ -32,6 +31,7 @@
.public GetItemToUse
.public GetLeader
.public GetLeaderMonster
.public GetMoneyCarried
.public GetMonsterGenderVeneer
.public GetPressedButtons
.public GetSleepAnimationId
@@ -168,7 +168,9 @@
.public RemoveEmptyItemsInBagWrapper
.public RemoveEquivItemNoHole
.public RemoveGroundItem
.public RemoveHolderForItemInBag
.public SetActionUseMovePlayer
.public SetHolderForItemInBag
.public SetLeaderActionFields
.public SetMonsterActionFields
.public ShouldMonsterRunAway
@@ -176,8 +178,6 @@
.public SpawnItem
.public sub_02001AB0
.public sub_02006B70
.public RemoveHolderForItemInBag
.public SetHolderForItemInBag
.public sub_02017C80
.public sub_02017CCC
.public sub_0201B9F8
@@ -194,8 +194,8 @@
.public sub_0204AF10
.public sub_0204AF20
.public sub_0204AF78
.public sub_02056754
.public SubstitutePlaceholderStringTags
.public TryAddMonsterToActiveTeam
.public TryLeaderItemPickUp
.public TryPointCameraToMonster
.public TryTriggerMonsterHouse

76
asm/main_02000C6C.s
View File

@@ -4423,7 +4423,7 @@ _02004270:
ldr r2, _020047D8 ; =0x00000000
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4433,7 +4433,7 @@ _02004294:
ldr r2, _020047DC ; =0x0000000A
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4443,7 +4443,7 @@ _020042B8:
ldr r2, _020047E0 ; =0x00000023
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4453,7 +4453,7 @@ _020042DC:
ldr r2, _020047E4 ; =0x00000001
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4463,7 +4463,7 @@ _02004300:
ldr r2, _020047E8 ; =0x00000002
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4473,7 +4473,7 @@ _02004324:
ldr r2, _020047EC ; =0x00000003
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4483,7 +4483,7 @@ _02004348:
ldr r2, _020047F0 ; =0x00000006
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4493,7 +4493,7 @@ _0200436C:
ldr r2, _020047F4 ; =0x00000004
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4503,7 +4503,7 @@ _02004390:
ldr r2, _020047F8 ; =0x00000005
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4513,7 +4513,7 @@ _020043B4:
ldr r2, _020047FC ; =0x00000007
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4523,7 +4523,7 @@ _020043D8:
ldr r2, _02004800 ; =0x00000008
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4533,7 +4533,7 @@ _020043FC:
ldr r2, _02004804 ; =0x00000009
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4543,7 +4543,7 @@ _02004420:
ldr r2, _02004808 ; =0x0000000B
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4553,7 +4553,7 @@ _02004444:
ldr r2, _0200480C ; =0x0000001D
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4563,7 +4563,7 @@ _02004468:
ldr r2, _02004810 ; =0x00000022
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4573,7 +4573,7 @@ _0200448C:
ldr r2, _02004814 ; =0x0000000C
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4583,7 +4583,7 @@ _020044B0:
ldr r2, _02004818 ; =0x0000000D
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4593,7 +4593,7 @@ _020044D4:
ldr r2, _0200481C ; =0x0000000E
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4603,7 +4603,7 @@ _020044F8:
ldr r2, _02004820 ; =0x0000000F
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4613,7 +4613,7 @@ _0200451C:
ldr r2, _02004824 ; =0x00000010
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4623,7 +4623,7 @@ _02004540:
ldr r2, _02004828 ; =0x00000011
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4633,7 +4633,7 @@ _02004564:
ldr r2, _0200482C ; =0x00000012
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4643,7 +4643,7 @@ _02004588:
ldr r2, _02004830 ; =0x00000013
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4653,7 +4653,7 @@ _020045AC:
ldr r2, _02004834 ; =0x00000014
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4663,7 +4663,7 @@ _020045D0:
ldr r2, _02004838 ; =0x00000015
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4673,7 +4673,7 @@ _020045F4:
ldr r2, _0200483C ; =0x00000016
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4683,7 +4683,7 @@ _02004618:
ldr r2, _02004840 ; =0x00000017
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4693,7 +4693,7 @@ _0200463C:
ldr r2, _02004844 ; =0x00000018
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4703,7 +4703,7 @@ _02004660:
ldr r2, _02004848 ; =0x00000019
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4713,7 +4713,7 @@ _02004684:
ldr r2, _0200484C ; =0x0000001A
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4723,7 +4723,7 @@ _020046A8:
ldr r2, _02004850 ; =0x0000001B
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4733,7 +4733,7 @@ _020046CC:
ldr r2, _02004854 ; =0x0000001C
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4743,7 +4743,7 @@ _020046F0:
ldr r2, _02004858 ; =0x0000001E
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4753,7 +4753,7 @@ _02004714:
ldr r2, _0200485C ; =0x0000001F
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4763,7 +4763,7 @@ _02004738:
ldr r2, _02004860 ; =0x00000020
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4773,7 +4773,7 @@ _0200475C:
ldr r2, _02004864 ; =0x00000021
add r0, sp, #0x10
mov r1, #0
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
bne _020047A0
mov r0, #1
@@ -4790,14 +4790,14 @@ _02004780:
bl FatalError
_020047A0:
add r0, sp, #0x10
bl sub_0207FD98
bl LoadOverlayInternal
cmp r0, #0
bne _020047B8
mov r0, #1
bl CardPullOutWithStatus
_020047B8:
add r0, sp, #0x10
bl sub_0207FEBC
bl InitOverlay
bl DataTransferStop
_020047C4:
add sp, sp, #0x3c

50
asm/main_0200C4CC.s
View File

@@ -90215,7 +90215,7 @@ _02055C7C:
cmpne r7, #2
mov r0, r7
bne _02055CAC
bl sub_02056754
bl TryAddMonsterToActiveTeam
b _02055CB0
_02055CAC:
bl sub_02056554
@@ -91106,8 +91106,8 @@ _02056748:
_02056750: .word TEAM_MEMBER_TABLE_PTR
arm_func_end sub_020566C4
arm_func_start sub_02056754
sub_02056754: ; 0x02056754
arm_func_start TryAddMonsterToActiveTeam
TryAddMonsterToActiveTeam: ; 0x02056754
stmdb sp!, {r4, lr}
mvn r1, #0
cmp r0, r1
@@ -91171,7 +91171,7 @@ _02056824:
ldmia sp!, {r4, pc}
.align 2, 0
_0205682C: .word TEAM_MEMBER_TABLE_PTR
arm_func_end sub_02056754
arm_func_end TryAddMonsterToActiveTeam
arm_func_start sub_02056830
sub_02056830: ; 0x02056830
@@ -91274,8 +91274,8 @@ sub_02056914: ; 0x02056914
_0205695C: .word TEAM_MEMBER_TABLE_PTR
arm_func_end sub_02056914
arm_func_start sub_02056960
sub_02056960: ; 0x02056960
arm_func_start RemoveActiveMembersFromMainTeam
RemoveActiveMembersFromMainTeam: ; 0x02056960
stmdb sp!, {r3, r4, r5, lr}
mov r0, #0
ldr r2, _020569C8 ; =TEAM_MEMBER_TABLE_PTR
@@ -91305,7 +91305,7 @@ _02056978:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020569C8: .word TEAM_MEMBER_TABLE_PTR
arm_func_end sub_02056960
arm_func_end RemoveActiveMembersFromMainTeam
arm_func_start SetTeamSetupHeroAndPartnerOnly
SetTeamSetupHeroAndPartnerOnly: ; 0x020569CC
@@ -91344,12 +91344,12 @@ _02056A40:
cmp sl, #4
add sb, sb, #0x68
blt _02056A08
bl sub_02056960
bl RemoveActiveMembersFromMainTeam
mvn r0, #0
cmp r5, r0
beq _02056A68
mov r0, r5
bl sub_02056754
bl TryAddMonsterToActiveTeam
_02056A68:
mvn r0, #0
cmp r6, r0
@@ -91406,12 +91406,12 @@ _02056B10:
cmp sl, #4
add sb, sb, #0x68
blt _02056AE0
bl sub_02056960
bl RemoveActiveMembersFromMainTeam
mvn r0, #0
cmp r7, r0
beq _02056B38
mov r0, r7
bl sub_02056754
bl TryAddMonsterToActiveTeam
_02056B38:
ldr r0, _02056B54 ; =TEAM_MEMBER_TABLE_PTR
ldr r0, [r0]
@@ -91470,9 +91470,9 @@ sub_02056BD4: ; 0x02056BD4
ldrb r0, [r0, #0x877]
cmp r0, #2
ldmneia sp!, {r3, pc}
bl sub_02056960
bl RemoveActiveMembersFromMainTeam
bl GetHeroMemberIdx
bl sub_02056754
bl TryAddMonsterToActiveTeam
bl GetPartnerMemberIdx
bl sub_02056554
ldr r0, _02056C1C ; =TEAM_MEMBER_TABLE_PTR
@@ -92604,7 +92604,7 @@ _02057B10:
moveq r0, #0
and r7, r0, #0xff
bl sub_02057C40
bl sub_02056960
bl RemoveActiveMembersFromMainTeam
mov sb, #0
ldr r0, _02057C3C ; =TEAM_MEMBER_TABLE_PTR
mov r6, #1
@@ -92639,7 +92639,7 @@ _02057B50:
tst r0, #0xff
ldrsh r0, [r8, #8]
beq _02057BB8
bl sub_02056754
bl TryAddMonsterToActiveTeam
b _02057BBC
_02057BB8:
bl sub_02056554
@@ -142204,8 +142204,8 @@ _0207FC3C:
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
arm_func_end sub_0207FBA4
arm_func_start sub_0207FC9C
sub_0207FC9C: ; 0x0207FC9C
arm_func_start GetOverlayInfo
GetOverlayInfo: ; 0x0207FC9C
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #0x60
movs r4, r1
@@ -142271,10 +142271,10 @@ _0207FD88: .word _022BB604
_0207FD8C: .word _022BB60C
_0207FD90: .word 0x027FFE50
_0207FD94: .word _022BB614
arm_func_end sub_0207FC9C
arm_func_end GetOverlayInfo
arm_func_start sub_0207FD98
sub_0207FD98: ; 0x0207FD98
arm_func_start LoadOverlayInternal
LoadOverlayInternal: ; 0x0207FD98
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #0x50
mov r5, r0
@@ -142312,7 +142312,7 @@ _0207FE18:
mov r0, #1
add sp, sp, #0x50
ldmia sp!, {r3, r4, r5, pc}
arm_func_end sub_0207FD98
arm_func_end LoadOverlayInternal
arm_func_start sub_0207FE28
sub_0207FE28: ; 0x0207FE28
@@ -142358,8 +142358,8 @@ _0207FEA4:
_0207FEB8: .word _020B2BB8
arm_func_end sub_0207FE28
arm_func_start sub_0207FEBC
sub_0207FEBC: ; 0x0207FEBC
arm_func_start InitOverlay
InitOverlay: ; 0x0207FEBC
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
bl sub_0207FB24
@@ -142427,7 +142427,7 @@ _0207FFA0: .word 0x027FFC40
_0207FFA4: .word _020B3364
_0207FFA8: .word _020B3364
_0207FFAC: .word 0x66666667
arm_func_end sub_0207FEBC
arm_func_end InitOverlay
arm_func_start sub_0207FFB0
sub_0207FFB0: ; 0x0207FFB0
@@ -142520,7 +142520,7 @@ sub_020800B0: ; 0x020800B0
mov r2, r1
add r0, sp, #0
mov r1, r3
bl sub_0207FC9C
bl GetOverlayInfo
cmp r0, #0
beq _020800E4
add r0, sp, #0

776
asm/overlay_11.s
View File

File diff suppressed because it is too large Load Diff

2
asm/overlay_17.s
View File

@@ -1521,7 +1521,7 @@ ov17_0238B534: ; 0x0238B534
ldr r0, [r0]
add r0, r0, #0x200
ldrsh r0, [r0, #0x58]
bl sub_02056754
bl TryAddMonsterToActiveTeam
bl sub_02057444
bl ov11_022DC504
ldr r0, _0238B578 ; =ov17_0238BE00

2
asm/overlay_29_022F05B4.s
View File

@@ -3712,7 +3712,7 @@ _022F39D8:
cmp r8, r4
beq _022F3A40
mov r0, r8
bl sub_02056754
bl TryAddMonsterToActiveTeam
b _022F3A40
_022F3A38:
mov r0, #0