Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-04-25 07:24:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added ITCM

Browse Source
This commit is contained in:
AnonymousRandomPerson 2023-07-08 23:09:09 -04:00
parent b034d9bc2c
commit e87e69a4a4
19 changed files with 4043 additions and 12127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
asm/include/itcm.inc Normal file
View File

@ -0,0 +1,74 @@
#include <nitro/fs/overlay.h>
#pragma once
.public IsMonster__0231A9D4
.public sub_0207A238
.public ov29_02338350
.public ShouldMonsterRunAwayVariation
.public CanAiMonsterMoveInDirection
.public sub_0207C4C8
.public ov29_02300B40
.public DungeonRandInt
.public ov29_023082C4
.public SetActionUseMoveAi
.public GetMoveTypeForMonster
.public GetMoveAiWeight
.public ov29_02300DCC
.public ov29_02301594
.public GetEntityMoveTargetAndRange
.public Abs
.public ov29_022EBC74
.public sub_0202760C
.public DungeonRandOutcome__022EAB20
.public IsBagFull
.public ov29_0231985C
.public GetAllBaseForms
.public CanAiUseMove
.public sub_0207A300
.public EnableIrqFlag
.public sub_02027AF0
.public ov29_02301F20
.public EntityIsValid__0230827C
.public AiConsiderMove
.public GetTileSafe
.public sub_020275F8
.public sub_0207A244
.public AbilityIsActive2
.public ov11_022FBE04
.public IqSkillIsEnabled
.public ov29_022E333C
.public SetMonsterActionFields
.public sub_0207A324
.public GetDirectionTowardsPosition
.public ov29_022E935C
.public ov29_02301498
.public sub_0207C40C
.public GetChebyshevDistance
.public ov29_022FBDF0
.public GetTile
.public ov29_022E1610
.public sub_020777A8
.public ov29_022E274C
.public ov29_023245A4
.public sub_0201E494
.public UpdateAiTargetPos
.public TryAddTargetToAiTargetList
.public HasDropeyeStatus
.public CanTargetPosition
.public InitMove
.public ov29_0231A460
.public SetActionRegularAttack
.public ov29_02344160
.public ov29_0231B008
.public SetActionPassTurnOrWalk
.public CanTargetEntity
.public ov29_023082A0
.public CeilFixedPoint
.public ShouldMonsterHeadToStairs
.public GetTileAtEntity
.public ov29_022FF908
.public IsMonsterCornered
.public SetIrqFlag
.public ov29_02302200
.public EntityIsValid__02319F8C
.public ov29_0230175C
.public ov29_02348D00

102
asm/include/main.inc
View File

@ -1,120 +1,62 @@
#include <nitro/fs/overlay.h>
#pragma once
.public FUN_01FF9AA8
.public FUN_023A679C
.public FUN_01FF950C
.public FUN_023BAC88
.public ov00_022C23EC
.public FUN_023A5EA0
.public ov00_02310C18
.public FUN_01FF9128
.public FUN_0239C990
.public FUN_01FF9434
.public FUN_023BC678
.public ov01_02337428
.public FUN_023BC818
.public FUN_0239DCD4
.public FUN_01FF8CAC
.public ov29_02300164
.public FUN_023B7184
.public FUN_023A43A0
.public FUN_023D602C
.public FUN_01FF905C
.public FUN_023A440C
.public ov00_022C24DC
.public FUN_01FF9B18
.public FUN_0239E6BC
.public ov00_022BE0C8
.public FUN_023F14E4
.public FUN_023F147C
.public ov00_022C2340
.public FUN_01FF8000
.public FUN_023FF4E0
.public FUN_023A6788
.public FUN_023B44C4
.public FUN_023F36D0
.public FUN_0239C9A8
.public FUN_023A46DC
.public ov11_023061CC
.public FUN_023BD2D0
.public ov02_0233CDD8
.public FUN_01FF8D3C
.public FUN_020CA140
.public FUN_023C35FC
.public ov11_022DC240
.public FUN_023DF924
.public FUN_0210F7E4
.public FUN_023A6FD0
.public FUN_01FF9B3C
.public FUN_01FF80B0
.public ov00_022F98B4
.public ov01_02337C54
.public ov00_022C2450
.public ov00_022E96E4
.public FUN_0239DB90
.public FUN_023BD5FC
.public FUN_01FF9A68
.public ov01_02337B3C
.public FUN_01FF8CDC
.public FUN_023A703C
.public FUN_023C3644
.public ov00_022FBAF0
.public ov00_022E2A78
.public FUN_023BC14C
.public ov00_0230D92C
.public ov00_0230D220
.public ov02_0233CDC8
.public FUN_020CED0C
.public ov00_023002F0
.public ov01_02337BA0
.public ov02_0233CB3C
.public FUN_023D57E0
.public ov11_022E82CC
.public ov00_022EA62C
.public FUN_023BBEC0
.public ov02_0233CAD8
.public FUN_023BD580
.public FUN_01FF8D6C
.public ov11_02306C9C
.public FUN_023B7170
.public FUN_023D4C00
.public FUN_023BCA28
.public FUN_0213778C
.public ov02_0233CAA8
.public FUN_023DFDF4
.public FUN_020CEB38
.public CanMonsterUseMove
.public FUN_023BD0F8
.public FUN_0210C3E4
.public FUN_023D5D54
.public FUN_02137848
.public FUN_023A5E18
.public FUN_01FF8D9C
.public FUN_023BCADC
.public FUN_01FF8D0C
.public FUN_021418DC
.public FUN_01FF8F28
.public FUN_023BC914
.public ov02_02347100
.public ov00_022C2528
.public FUN_020C034C
.public ov02_0233CB10
.public ov11_02310BDC
.public FUN_01FF97CC
.public ov11_02306C64
.public FUN_023BD300
.public FUN_02404080
.public CheckEndDungeon
.public FUN_023BC498
.public FUN_023C3620
.public FUN_023B57B0
.public FUN_01FF8DCC
.public FUN_023A6FF4
.public ov02_0233CDE4
.public ov00_022C23B0
.public FUN_023BD2A0
.public ov01_02337E0C
.public FUN_0239DACC
.public FUN_01FF929C
.public FUN_01FF8F04
.public ov11_023061E4
.public ov11_023061E4
.public sub_01FF905C
.public sub_01FF8CDC
.public sub_01FF9B3C
.public sub_01FF9128
.public sub_01FF9B18
.public sub_01FF8D9C
.public sub_01FF8F28
.public sub_01FF929C
.public sub_01FF8F04
.public sub_01FF80B0
.public GetKeyM2NSwitch
.public sub_01FF8D6C
.public sub_01FF8D3C
.public sub_01FF9AA8
.public sub_01FF8CAC
.public sub_01FF8000
.public sub_01FF9A68
.public sub_01FF8DCC
.public sub_01FF97CC
.public GetKeyN2MSwitch
.public sub_01FF8D0C

5
asm/include/overlay_03.inc
View File

@ -23,7 +23,7 @@
.public ov01_0233580C
.public sub_020433C0
.public MemFree
.public DebugPrint0
.public DebugPrint0__0200C1FC
.public sub_02046BB4
.public sub_02010154
.public ov01_023375B0
@ -140,7 +140,7 @@
.public ov01_0232CB1C
.public GetMaxItemsAllowed
.public MemcpySimple
.public LoadFileFromRom
.public LoadFileFromRom__02008C3C
.public IsItemValidVeneer
.public sub_0205B6EC
.public sub_02042CF0
@ -242,3 +242,4 @@
.public ov01_02335FA8
.public sub_0202BCBC
.public sub_020698B8
.public sub_02046D20

4
asm/include/overlay_04.inc
View File

@ -75,7 +75,7 @@
.public ov01_02337DD0
.public sub_02043320
.public ov01_02337D00
.public LoadFileFromRom
.public LoadFileFromRom__02008C3C
.public sub_020434FC
.public GetLanguageType
.public RandInt
@ -87,3 +87,5 @@
.public InitPreprocessorArgs
.public sub_0200D8E4
.public sub_02043434
.public sub_02046D20
.public sub_0200FD48

2
asm/include/overlay_10.inc
View File

@ -25,7 +25,7 @@
.public sub_0204F244
.public ShowPortraitBox
.public sub_020263C8
.public LoadFileFromRom
.public LoadFileFromRom__02008C3C
.public sub_02033350
.public sub_02001808
.public Rand16Bit

3
asm/include/overlay_11.inc
View File

@ -106,7 +106,7 @@
.public sub_02063734
.public sub_0200CF78
.public GetDebugFlag2
.public GetScenarioBalance
.public GetScenarioBalance__0204CB94
.public sub_0204F158
.public sub_0204BED8
.public sub_02055474
@ -715,3 +715,4 @@
.public ClampComponentAbs
.public sub_020420F4
.public sub_02003A40
.public LoadFileFromRom__02008C3C

5
asm/include/overlay_19.inc
View File

@ -26,7 +26,7 @@
.public RemoveItemNoHole
.public sub_02065BAC
.public sub_02011528
.public GetScenarioBalance
.public GetScenarioBalance__0204CB94
.public PreprocessString
.public sub_02055474
.public sub_0202E6C8
@ -135,3 +135,6 @@
.public SetPortraitUnknownAttr
.public sub_02056E04
.public sub_020407C0
.public sub_02046D20
.public sub_02017C74
.public sub_02017C50

19
asm/include/overlay_29.inc
View File

@ -85,7 +85,6 @@
.public sub_02008F88
.public sub_0201C0CC
.public sub_02009514
.public FUN_01FFA3C4
.public sub_02056754
.public DecrementStackItem
.public sub_020038E8
@ -131,7 +130,6 @@
.public GetCanMoveFlag
.public sub_0204AEE0
.public sub_0201CF90
.public FUN_01FFBDF4
.public ov10_022BFD58
.public sub_02017A68
.public ov10_022BEC08
@ -190,7 +188,6 @@
.public RemoveEquivItem
.public FailsWhileMuzzled
.public ov31_0238941C
.public FUN_01FFB62C
.public StrncpySimple
.public ov10_022C26BC
.public sub_0204AEA0
@ -288,7 +285,6 @@
.public Vsprintf
.public sub_0202AAE8
.public ov10_022BFB6C
.public FUN_01FFB658
.public GetMaxReachedFloor
.public IsMoneyAllowed
.public sub_02017B70
@ -313,10 +309,8 @@
.public GetSpriteSize
.public GetType
.public sub_0201D1B0
.public FUN_01FF8C60
.public sub_02025314
.public SetMoneyCarried
.public FUN_01FF81CC
.public sub_02048240
.public sub_02051EB8
.public sub_02008F3C
@ -370,7 +364,6 @@
.public GetActualBuyPrice
.public ov10_022BDC68
.public RemoveItem
.public FUN_01FFBE5C
.public sub_02027148
.public sub_02055020
.public ov31_023877EC
@ -428,7 +421,7 @@
.public sub_0201E730
.public sub_020483D8
.public ov10_022C1E80
.public LoadFileFromRom
.public LoadFileFromRom__02008C3C
.public ov30_02382E08
.public UnloadWte
.public sub_02058C3C
@ -612,7 +605,6 @@
.public GetMaxItemsAllowed
.public sub_02024FC8
.public sub_0204AEC0
.public FUN_01FF8130
.public Memcpy32
.public sub_02051EF0
.public sub_02057CE8
@ -658,3 +650,12 @@
.public DebugPrint0__0200C1FC
.public GetSpriteIndex__020526EC
.public GetSpriteIndex__02052708
.public LightningRodStormDrainCheck
.public ChooseAiMove
.public AiMovement
.public sub_01FF81CC
.public sub_01FFBDF4
.public sub_01FFB62C
.public sub_01FF8C60
.public sub_01FF8130
.public GetScenarioBalance__0204CB94

2
asm/include/overlay_31.inc
View File

@ -88,7 +88,6 @@
.public sub_020416DC
.public sub_02041A00
.public sub_02041B7C
.public FUN_01FFA3C4
.public sub_0203FE5C
.public ov29_022E0C2C
.public ov11_02300BF8
@ -229,3 +228,4 @@
.public sub_0202F334
.public sub_020416FC
.public sub_020410A4
.public AiMovement

3671
asm/itcm.s Normal file
View File

File diff suppressed because it is too large Load Diff

12032
asm/main.s
View File

File diff suppressed because it is too large Load Diff

76
asm/overlay_03.s
View File

@ -118,7 +118,7 @@ ov03_0233CB3C: ; 0x0233CB3C
ldr r0, _0233CB90 ; =0x02346BF0
mov r1, #0
str r1, [r0, #4]
bl sub_020473A4
bl sub_02046D20
mov r0, #0
bl ov01_023375B0
mov r0, #1
@ -392,7 +392,7 @@ _0233CF0C:
ldr r1, _0233CF94 ; =0x00004001
ldr r0, [r0]
str r1, [r0, #0x10]
bl sub_020473A4
bl sub_02046D20
b _0233CF68
_0233CF30:
bl ov03_0234472C
@ -435,7 +435,7 @@ ov03_0233CF9C: ; 0x0233CF9C
ldr r0, [r0]
cmp r0, #0
ldmeqdb sp!, {r3, pc}
bl sub_020473A4
bl sub_02046D20
ldr r0, _0233CFD0 ; =0x02346BF0
ldr r0, [r0]
bl MemFree
@ -463,7 +463,7 @@ ov03_0233CFD4: ; 0x0233CFD4
bl sub_0204E644
cmp r0, #0
movne r0, #1
ldmneia sp!, {r3, pc}
ldmnedb sp!, {r3, pc}
_0233D010:
mov r0, #0
ldmdb sp!, {r3, pc}
@ -2070,7 +2070,7 @@ _0233E620:
cmp r0, #0
beq _0233F2C4
_0233E644:
bl sub_020473A4
bl sub_02046D20
ldr r0, _0233EE08 ; =0x02346BC0
ldr r1, _0233EE50 ; =0x00000312
ldr r0, [r0]
@ -2121,7 +2121,7 @@ _0233E6D0:
ldr r1, _0233EE54 ; =0x00000321
ldr r0, [r0]
str r1, [r0]
bl sub_020473A4
bl sub_02046D20
b _0233F2C4
_0233E704:
bl GetKeyboardStatus
@ -2373,7 +2373,7 @@ _0233EA70:
mov r7, #0xb
_0233EA74:
ldr r0, _0233EE5C ; =0x02346A64
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r5, _0233EE60 ; =0x02346A68
ldr r4, _0233EE08 ; =0x02346BC0
mov r6, #0
@ -2382,12 +2382,12 @@ _0233EA88:
mov r0, r5
add r1, r1, r6
ldrb r1, [r1, #0x10c]
bl DebugPrint0
bl DebugPrint0__0200C1FC
add r6, r6, #1
cmp r6, #0x36
blt _0233EA88
ldr r0, _0233EE5C ; =0x02346A64
bl DebugPrint0
bl DebugPrint0__0200C1FC
cmp r7, #0xa
addls pc, pc, r7, lsl #2
b _0233F2C4
@ -4817,7 +4817,7 @@ _02340D20:
ldmdb sp!, {r3, pc}
_02340D28:
cmp r0, #2
ldmneia sp!, {r3, pc}
ldmnedb sp!, {r3, pc}
bl ov00_022BD274
cmp r0, #0
beq _02340D54
@ -5828,7 +5828,7 @@ _02341B80:
bl ov02_02338EC4
cmp r0, #5
bne _02341BB0
bl sub_020473A4
bl sub_02046D20
bl ov01_02338C34
ldr r0, _02341D00 ; =0x02346BC8
ldr r1, _02341DB8 ; =0x00004008
@ -6705,7 +6705,7 @@ _02342818:
cmp r5, #5
bne _0234287C
bl sub_02069904
bl sub_020473A4
bl sub_02046D20
bl ov01_02338C34
ldr r0, _02341D00 ; =0x02346BC8
ldr r1, _02341DB8 ; =0x00004008
@ -7253,7 +7253,7 @@ _0234301C:
mov r1, #0xe8
str r2, [r0, #0x1c]
str r1, [r0, #0x20]
bl sub_020473A4
bl sub_02046D20
ldr r0, _02342FD0 ; =0x02346BC8
ldr r1, _02343F74 ; =0x00005006
ldr r0, [r0]
@ -7348,7 +7348,7 @@ _0234319C:
bl sub_02066494
cmp r4, #5
bne _023431CC
bl sub_020473A4
bl sub_02046D20
bl ov01_02338C34
ldr r0, _02342FD0 ; =0x02346BC8
ldr r1, _02343F84 ; =0x00004008
@ -7358,7 +7358,7 @@ _0234319C:
_023431CC:
cmp r0, #0x1f
bne _02344184
bl sub_020473A4
bl sub_02046D20
ldr r0, _02342FD0 ; =0x02346BC8
ldr r1, _02343F88 ; =0x00005003
ldr r0, [r0]
@ -7668,7 +7668,7 @@ _02343650:
ldr r1, _02343F74 ; =0x00005006
ldr r0, [r0]
str r1, [r0]
bl sub_020473A4
bl sub_02046D20
b _02344184
_02343668:
cmp r4, #0x1f
@ -7688,7 +7688,7 @@ _02343678:
cmp r5, #5
bne _023436C4
bl sub_02046BB4
bl sub_020473A4
bl sub_02046D20
bl ov01_02338C34
ldr r0, _02342FD0 ; =0x02346BC8
ldr r1, _02343F84 ; =0x00004008
@ -7714,7 +7714,7 @@ _023436FC:
sub r0, r4, #0x1e
cmp r0, #1
bhi _02344184
bl sub_020473A4
bl sub_02046D20
ldr r0, _02342FD0 ; =0x02346BC8
ldr r1, _02343F88 ; =0x00005003
ldr r0, [r0]
@ -7726,7 +7726,7 @@ _02343720:
bl sub_02066494
cmp r4, #5
bne _02343750
bl sub_020473A4
bl sub_02046D20
bl ov01_02338C34
ldr r0, _02342FD0 ; =0x02346BC8
ldr r1, _02343F84 ; =0x00004008
@ -7750,7 +7750,7 @@ _02343778:
bl sub_02066494
cmp r4, #5
bne _023437A8
bl sub_020473A4
bl sub_02046D20
bl ov01_02338C34
ldr r0, _02342FD0 ; =0x02346BC8
ldr r1, _02343F84 ; =0x00004008
@ -8004,7 +8004,7 @@ _02343B08:
strgt r1, [r0, #0xae0]
cmp r5, #5
bne _02343B68
bl sub_020473A4
bl sub_02046D20
bl ov01_02338C34
ldr r0, _02342FD0 ; =0x02346BC8
ldr r1, _02343F84 ; =0x00004008
@ -8427,7 +8427,7 @@ _02344130:
bne _02344170
ldr r0, _02343F74 ; =0x00005006
str r0, [r1]
bl sub_020473A4
bl sub_02046D20
_02344170:
ldr r0, _02343FF0 ; =0x02346BC8
mov r1, #0
@ -8701,7 +8701,7 @@ _023444CC:
streq r0, [r4]
b _023446DC
_023444E0:
bl sub_020473A4
bl sub_02046D20
mov r0, #0x12
bl sub_020668B4
mov r0, #3
@ -8938,7 +8938,7 @@ _023447E8:
str r0, [sp, #0xac]
ldr r0, [r4, #8]
str r0, [sp, #0xa0]
bl sub_020473A4
bl sub_02046D20
mov r0, #0xa
str r0, [sp]
mov r5, #8
@ -9687,7 +9687,7 @@ _02345250:
ldrb r0, [r7, #0xad]
cmp r0, #0
bne _02345298
bl sub_020473A4
bl sub_02046D20
ldr r0, _02345A5C ; =0x02346BDC
ldr r1, _02345A64 ; =0x00002010
ldr r0, [r0]
@ -9900,7 +9900,7 @@ _0234557C:
bl ov01_023375D0
cmp r4, #0x1d
bne _023455B8
bl sub_020473A4
bl sub_02046D20
ldr r0, _02345A5C ; =0x02346BDC
ldr r1, _02345AF8 ; =0x00002003
ldr r0, [r0]
@ -9909,7 +9909,7 @@ _0234557C:
_023455B8:
cmp r4, #0x1e
bne _023455D8
bl sub_020473A4
bl sub_02046D20
ldr r0, _02345A5C ; =0x02346BDC
ldr r1, _02345A64 ; =0x00002010
ldr r0, [r0]
@ -10065,7 +10065,7 @@ _023457F4:
bl sub_02066494
cmp r0, #0x1f
bne _02346640
bl sub_020473A4
bl sub_02046D20
ldr r0, _02345A5C ; =0x02346BDC
ldr r1, _02345B14 ; =0x00003033
ldr r0, [r0]
@ -10293,7 +10293,7 @@ _02345B5C:
sub r0, r4, #0x1e
cmp r0, #1
bhi _02346640
bl sub_020473A4
bl sub_02046D20
ldr r0, _02345A5C ; =0x02346BDC
ldr r1, _02345B14 ; =0x00003033
ldr r0, [r0]
@ -10354,7 +10354,7 @@ _02345C10:
ldr r0, [r0]
strb r1, [r0, #0x14]
_02345C4C:
bl sub_020473A4
bl sub_02046D20
ldr r0, _02345A5C ; =0x02346BDC
ldr r1, _02345B14 ; =0x00003033
ldr r0, [r0]
@ -10364,7 +10364,7 @@ _02345C64:
bl sub_02066494
cmp r0, #0x1f
bne _02346640
bl sub_020473A4
bl sub_02046D20
ldr r0, _02345A5C ; =0x02346BDC
ldr r1, _02345B14 ; =0x00003033
ldr r0, [r0]
@ -10502,7 +10502,7 @@ _02345E2C:
ldr r3, [r2, #4]
ldr r2, _02346670 ; =0x0000030F
ldrb r8, [r3, #0xae]
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
mov r5, #0
mov fp, r5
mov r4, #1
@ -10626,7 +10626,7 @@ _02346010:
bl sub_02066494
cmp r0, #0x1f
bne _02346640
bl sub_020473A4
bl sub_02046D20
ldr r0, _02345A5C ; =0x02346BDC
ldr r1, _02346678 ; =0x00003533
ldr r0, [r0]
@ -10829,7 +10829,7 @@ _02346300:
sub r0, r4, #0x1e
cmp r0, #1
bhi _02346640
bl sub_020473A4
bl sub_02046D20
ldr r0, _02345A5C ; =0x02346BDC
ldr r1, _02346678 ; =0x00003533
ldr r0, [r0]
@ -10866,7 +10866,7 @@ _02346374:
mvn r1, #1
ldr r0, [r0]
strb r1, [r0, #0x14]
bl sub_020473A4
bl sub_02046D20
ldr r0, _02345A5C ; =0x02346BDC
ldr r1, _02346678 ; =0x00003533
ldr r0, [r0]
@ -10899,7 +10899,7 @@ _023463FC:
cmp r0, #1
bne _02346424
bl ov03_023466E8
bl sub_020473A4
bl sub_02046D20
ldr r0, _02345A5C ; =0x02346BDC
ldr r1, _02346678 ; =0x00003533
ldr r0, [r0]
@ -10995,7 +10995,7 @@ _02346560:
cmp r0, #1
bne _02346640
bl sub_020420F4
bl sub_020473A4
bl sub_02046D20
ldr r0, _02345A5C ; =0x02346BDC
ldr r1, _02346678 ; =0x00003533
ldr r0, [r0]
@ -11005,7 +11005,7 @@ _02346588:
bl sub_02066494
cmp r0, #0x1f
bne _02346640
bl sub_020473A4
bl sub_02046D20
ldr r0, _02345A5C ; =0x02346BDC
ldr r1, _02346678 ; =0x00003533
ldr r0, [r0]

26
asm/overlay_04.s
View File

@ -188,7 +188,7 @@ _0233CBE4:
ldr r0, _0233CC44 ; =0x0233F670
mov r1, #0
str r1, [r0, #4]
bl sub_020473A4
bl sub_02046D20
ldr r0, _0233CC48 ; =0x0233F640
mov r1, #0
str r1, [r0]
@ -592,7 +592,7 @@ ov04_0233D1A0: ; 0x0233D1A0
ldr r0, [r0]
cmp r0, #0
ldmeqdb sp!, {r3, pc}
bl sub_020473A4
bl sub_02046D20
ldr r0, _0233D1D4 ; =0x0233F670
ldr r0, [r0]
bl MemFree
@ -647,7 +647,7 @@ ov04_0233D1D8: ; 0x0233D1D8
ldr r2, _0233D2B0 ; =0x0000030F
add r0, sp, #0
strb ip, [r3, #0x92d]
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
ldr r0, _0233D2A8 ; =0x0233F644
ldr r2, [sp]
ldr r0, [r0]
@ -966,7 +966,7 @@ _0233D648:
bl GetTeamNameCheck
add r0, sp, #0xec
bl InitPreprocessorArgs
bl sub_02050CE4
bl sub_0200FD48
mov r5, r0
bl sub_0200FD78
sub r0, r5, r0
@ -1036,7 +1036,7 @@ _0233D804:
bl ov04_0233CBA0
cmp r0, #8
bne _0233EEB4
bl sub_020473A4
bl sub_02046D20
ldr r0, _0233E264 ; =0x00001001
str r0, [r4]
b _0233EEB4
@ -1424,7 +1424,7 @@ _0233DD54:
_0233DD90:
mvn r0, #0
str r0, [r4, #0xc]
bl sub_020473A4
bl sub_02046D20
ldr r0, _0233E264 ; =0x00001001
str r0, [r4]
b _0233EEB4
@ -2036,7 +2036,7 @@ _0233E670:
bl ov04_0233CBA0
cmp r0, #8
bne _0233E6D4
bl sub_02050CE4
bl sub_0200FD48
mov r5, r0
bl sub_0200FD78
add r1, r4, #0x1800
@ -2683,11 +2683,11 @@ ov04_0233EF8C: ; 0x0233EF8C
ldrb r1, [r4, #3]
cmp r0, r1
movne r0, #3
ldmneia sp!, {r4, pc}
ldmnedb sp!, {r4, pc}
ldrb r0, [r4]
cmp r0, #0xf
movne r0, #2
ldmneia sp!, {r4, pc}
ldmnedb sp!, {r4, pc}
ldrsh r0, [r4, #0x1c]
cmp r0, #0
beq _0233F098
@ -2764,7 +2764,7 @@ ov04_0233F0A8: ; 0x0233F0A8
ldrb r1, [r4]
cmp r1, #0x14
movne r0, #2
ldmneia sp!, {r4, pc}
ldmnedb sp!, {r4, pc}
ldrb r1, [r4, #3]
cmp r0, r1
movne r0, #3
@ -2785,11 +2785,11 @@ ov04_0233F0E0: ; 0x0233F0E0
ldrb r1, [r5, #3]
cmp r0, r1
movne r0, #3
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmnedb sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldrb r0, [r5]
cmp r0, #0x13
movne r0, #2
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmnedb sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldrh r0, [r5, #4]
cmp r0, #0x3e8
movhi r0, #6
@ -3091,7 +3091,7 @@ _0233F500:
bl InitStandardItem
bl ov04_0233CAC8
cmp r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmnedb sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldrsh r0, [r4, #4]
bl IsItemInTimeDarkness
cmp r0, #0

6
asm/overlay_10.s
View File

@ -8288,7 +8288,7 @@ ov10_022C3938: ; 0x022C3938
ldr sl, [sp, #0x9c]
ldr sb, [sp, #0xa0]
ldr r8, [sp, #0xa4]
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
ldr r1, [sp, #0x64]
add r0, sp, #0x60
bl HandleSir0Translation
@ -8642,7 +8642,7 @@ ov10_022C3E8C: ; 0x022C3E8C
mov fp, r3
str r4, [sp, #0x10]
ldr r5, [sp, #0x50]
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
ldr r1, [sp, #0x20]
add r0, sp, #0x10
bl HandleSir0Translation
@ -8673,7 +8673,7 @@ ov10_022C3E8C: ; 0x022C3E8C
str r2, [sp, #0x18]
mov r2, #0xf
str r3, [sp, #0x1c]
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
ldr r1, [sp, #0x18]
add r0, sp, #0x14
bl HandleSir0Translation

34
asm/overlay_11.s
View File

@ -2011,7 +2011,7 @@ _022DDC6C:
ldr r2, _022DDD60 ; =0x0000030F
add r0, sp, #0x14
add r1, sp, #0x20
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
ldr r1, [sp, #0x14]
mov r0, #0x400
add r6, r1, #2
@ -9624,13 +9624,13 @@ _022E46D0:
ldmdb sp!, {r4, r5, r6, pc}
arm_func_end ov11_022E469C
arm_func_start LoadFileFromRom
LoadFileFromRom: ; 0x022E46DC
ldr ip, _022E46E4 ; =LoadFileFromRom
arm_func_start LoadFileFromRom__022E46DC
LoadFileFromRom__022E46DC: ; 0x022E46DC
ldr ip, _022E46E4 ; =LoadFileFromRom__02008C3C
bx ip
.align 2, 0
_022E46E4: .word LoadFileFromRom
arm_func_end LoadFileFromRom
_022E46E4: .word LoadFileFromRom__02008C3C
arm_func_end LoadFileFromRom__022E46DC
arm_func_start ov11_022E46E8
ov11_022E46E8: ; 0x022E46E8
@ -15394,7 +15394,7 @@ ov11_022E9438: ; 0x022E9438
_022E9468:
cmp r4, #2
ldmnedb sp!, {r4, pc}
bl GetScenarioBalance
bl GetScenarioBalance__0204CB94
cmp r0, #6
movhs r4, #3
bhs _022E9498
@ -19000,7 +19000,7 @@ _022EC2BC:
ldr r2, [sp]
add r1, sp, #0x4c
add r0, sl, #0x174
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
ldr r1, _022ECD00 ; =0x02320C6C
add r0, sp, #0x4c
add r2, sp, #0xd6
@ -19008,7 +19008,7 @@ _022EC2BC:
ldr r2, _022ECD04 ; =0x0000030F
add r0, sl, #0x184
add r1, sp, #0x4c
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
ldr r1, _022ECD08 ; =0x02320C80
add r0, sp, #0x4c
add r2, sp, #0xe0
@ -19016,7 +19016,7 @@ _022EC2BC:
ldr r2, _022ECD04 ; =0x0000030F
add r0, sl, #0x18c
add r1, sp, #0x4c
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
ldr r1, [sl, #0x184]
ldr r0, [sl, #0x174]
ldrh r2, [r1]
@ -19638,7 +19638,7 @@ _022ECBA8:
ldr r2, [sp]
add r0, r4, #8
add r1, sp, #0x4c
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
mov r0, #1
strb r0, [r4]
strb r0, [r4, #1]
@ -19757,7 +19757,7 @@ _022ECD5C:
add r0, sl, #0x174
add r1, sp, #0x38
mov r2, #6
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
ldr r1, _022ED220 ; =0x02320C6C
add r0, sp, #0x38
add r2, sp, #0xc2
@ -19765,7 +19765,7 @@ _022ECD5C:
ldr r2, _022ED224 ; =0x0000030F
add r0, sl, #0x184
add r1, sp, #0x38
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
ldr r1, _022ED228 ; =0x02320C80
add r0, sp, #0x38
add r2, sp, #0xcc
@ -19773,7 +19773,7 @@ _022ECD5C:
add r0, sl, #0x18c
add r1, sp, #0x38
mov r2, #6
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
add r1, sl, #0xea
ldr r0, [sl, #0x184]
ldr sb, [sl, #0x174]
@ -20860,7 +20860,7 @@ _022EDD48:
ldr r2, _022EDE60 ; =0x0000030F
add r1, sp, #0
add r0, r5, #0x18c
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
ldr lr, [r5, #0x18c]
add r4, r5, #0x1e0
ldrb r2, [lr]
@ -20965,7 +20965,7 @@ _022EDECC:
beq _022EE074
ldr r2, _022EE0BC ; =0x0000030F
add r0, sp, #0x18
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
ldr r0, [sp, #0x18]
bl GetAtSize
mov r4, r0
@ -41034,7 +41034,7 @@ _022FF760:
ldr r0, [r0, #4]
mov r2, #8
add r0, r0, #8
bl LoadFileFromRom
bl LoadFileFromRom__022E46DC
ldr r0, _022FF9E0 ; =0x02324D14
ldr r2, [r0, #4]
ldr r1, [r2, #8]

48
asm/overlay_19.s
View File

@ -236,7 +236,7 @@ _0238A3E8: .word 0x0238DAE8
ov19_0238A3EC: ; 0x0238A3EC
stmdb sp!, {r4, r5, r6, r7, r8, lr}
mov r8, r0
bl GetScenarioBalance
bl GetScenarioBalance__0204CB94
mov r6, #0
ldr r5, _0238A464 ; =0x0238DAE8
mov r4, r0
@ -512,7 +512,7 @@ _0238A790:
b _0238C598
_0238A7D8:
bl ov19_0238D47C
bl sub_020473A4
bl sub_02046D20
bl ov19_0238C5A8
ldr r1, _0238B424 ; =0x02324DB0
mvn r0, #1
@ -610,7 +610,7 @@ _0238A934:
beq _0238C598
ldr r0, _0238B45C ; =0x00003F02
mov r1, #0x100
bl sub_020182B8
bl sub_02017C74
ldrsb r0, [r8, #0x20]
bl ov10_022BCDA8
str r0, [r8, #0x58]
@ -716,7 +716,7 @@ _0238AAA8:
b _0238C598
_0238AAD4:
bl ov19_0238D47C
bl sub_020473A4
bl sub_02046D20
bl sub_0203A998
cmp r0, #0
bne _0238AAF4
@ -1043,7 +1043,7 @@ _0238AF0C:
cmp r0, #0
beq _0238AFB8
bl ov19_0238D47C
bl sub_020473A4
bl sub_02046D20
mov r0, #0x3d
str r0, [r8, #4]
mov r0, #0x1c
@ -1085,7 +1085,7 @@ _0238AFB8:
b _0238C598
_0238B01C:
bl ov19_0238D47C
bl sub_020473A4
bl sub_02046D20
mov r0, #0x3d
str r0, [r8, #4]
mov r0, #0x1c
@ -1238,7 +1238,7 @@ _0238B218: ; jump table
b _0238B234 ; case 5
b _0238B2B8 ; case 6
_0238B234:
bl sub_020473A4
bl sub_02046D20
add r0, r8, #0x100
mov r1, #0
strh r1, [r0]
@ -1301,7 +1301,7 @@ _0238B2B8:
b _0238C598
_0238B320:
bl ov19_0238D47C
bl sub_020473A4
bl sub_02046D20
add r0, r8, #0x10
mov r1, #0
bl SetPortraitExpressionId
@ -2058,7 +2058,7 @@ _0238BE08:
cmp r1, r0
bne _0238BE28
bl ov19_0238D47C
bl sub_020473A4
bl sub_02046D20
mov r0, #3
b _0238C59C
_0238BE28:
@ -2119,7 +2119,7 @@ _0238BEE0:
mov r3, r1
bl sub_02065BAC
bl ov19_0238D47C
bl sub_020473A4
bl sub_02046D20
mov r0, #0x3d
str r0, [r8, #4]
mov r0, #0x2c
@ -2133,7 +2133,7 @@ _0238BEE0:
strne r0, [r8]
bne _0238C598
bl ov19_0238D47C
bl sub_020473A4
bl sub_02046D20
mov r0, #0x11
str r0, [r8]
b _0238C598
@ -2196,7 +2196,7 @@ _0238C004:
moveq r0, #0
cmp r0, #0xa
bne _0238C598
bl sub_020473A4
bl sub_02046D20
mov r0, #0
add r1, r8, #0x100
ldrsh r1, [r1, #4]
@ -2216,7 +2216,7 @@ _0238C004:
strne r0, [r8]
bne _0238C598
bl ov19_0238D47C
bl sub_020473A4
bl sub_02046D20
mov r0, #0x13
str r0, [r8]
b _0238C598
@ -2311,7 +2311,7 @@ _0238C1BC:
cmp r0, #8
bne _0238C200
bl ov19_0238D47C
bl sub_020473A4
bl sub_02046D20
ldr r1, _0238C4FC ; =0x0238E1B4
add r0, r8, #0x10
bl SetPortraitAttrStruct
@ -2329,7 +2329,7 @@ _0238C200:
cmp r0, #1
bhi _0238C598
bl ov19_0238D47C
bl sub_020473A4
bl sub_02046D20
add r0, r8, #0x10
mov r1, #0
bl SetPortraitUnknownAttr
@ -2373,7 +2373,7 @@ _0238C2A0:
moveq r0, #0
cmp r0, #0xa
bne _0238C598
bl sub_020473A4
bl sub_02046D20
add r0, r8, #0x100
mov r1, #0
strh r1, [r0]
@ -2464,7 +2464,7 @@ _0238C3AC:
str r0, [r8]
b _0238C598
_0238C410:
bl sub_020473A4
bl sub_02046D20
add r0, r8, #0x100
mov r1, #0
strh r1, [r0]
@ -2543,7 +2543,7 @@ _0238C50C:
cmp r1, r0
bne _0238C544
bl ov19_0238D47C
bl sub_020473A4
bl sub_02046D20
mov r0, #3
b _0238C59C
_0238C544:
@ -2551,7 +2551,7 @@ _0238C544:
cmpne r1, #0xe
bne _0238C558
bl ov19_0238D47C
bl sub_020473A4
bl sub_02046D20
_0238C558:
mov r0, #0x3e
str r0, [r8, #4]
@ -3003,7 +3003,7 @@ ov19_0238CB2C: ; 0x0238CB2C
bl GetTeamMember
mov r4, r0
mov r0, #1
bl sub_0201820C
bl sub_02017C50
add r0, sp, #4
bl InitPreprocessorArgs
ldr r0, _0238CBB8 ; =0x02324DB0
@ -3257,7 +3257,7 @@ _0238CE78:
strb sl, [r0, #0x18]
cmp r4, #1
movne r0, #1
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldmnedb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
mov r0, #1
b _0238CEAC
_0238CE9C:
@ -3533,7 +3533,7 @@ _0238D250:
str r0, [r4]
b _0238D300
_0238D274:
bl sub_020473A4
bl sub_02046D20
add r0, r4, #0x100
mov r1, #0
strh r1, [r0]
@ -3541,7 +3541,7 @@ _0238D274:
str r0, [r4, #4]
b _0238D300
_0238D290:
bl sub_020473A4
bl sub_02046D20
add r0, r4, #0x100
mov r1, #0
strh r1, [r0]
@ -3584,7 +3584,7 @@ ov19_0238D310: ; 0x0238D310
ldr r0, _0238D384 ; =0x02324DB0
ldr r4, [r0]
bl ov19_0238D47C
bl sub_020473A4
bl sub_02046D20
add r0, r4, #0x100
mov r1, #0
strh r1, [r0]

58
asm/overlay_29.s
View File

@ -143,10 +143,10 @@ ov29_022DC33C: ; 0x022DC33C
ldr r4, [r3, #0xe0]
add r0, sp, #0
mov r1, #0x1b000
bl FUN_01FF8130
bl sub_01FF8130
add r0, sp, #0
add r1, r4, #0x3c00
bl FUN_01FF81CC
bl sub_01FF81CC
ldr r0, _022DC53C ; =0x00018304
mov r5, #0
ldr r4, _022DC530 ; =0x02353880
@ -202,7 +202,7 @@ _022DC454:
strh r3, [r4, #0x12]
strh r2, [r4, #0x22]
strh r1, [r4]
bl FUN_01FF8C60
bl sub_01FF8C60
_022DC50C:
add r0, r5, #1
mov r0, r0, lsl #0x10
@ -230,7 +230,7 @@ ov29_022DC544: ; 0x022DC544
mov r2, #0x300
ldr r1, [r1, r0, lsl #2]
add r0, sp, #0
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
ldr r4, [sp]
ldr r2, [sp, #4]
mov r0, r4
@ -5259,13 +5259,13 @@ _022E0950:
_022E0958: .word 0x02353538
arm_func_end StoryRestrictionsEnabled
arm_func_start GetScenarioBalance
GetScenarioBalance: ; 0x022E095C
ldr ip, _022E0964 ; =GetScenarioBalance
arm_func_start GetScenarioBalance__022E095C
GetScenarioBalance__022E095C: ; 0x022E095C
ldr ip, _022E0964 ; =GetScenarioBalance__0204CB94
bx ip
.align 2, 0
_022E0964: .word GetScenarioBalance
arm_func_end GetScenarioBalance
_022E0964: .word GetScenarioBalance__0204CB94
arm_func_end GetScenarioBalance__022E095C
arm_func_start FadeToBlack
FadeToBlack: ; 0x022E0968
@ -13387,18 +13387,18 @@ ov29_022E6FBC: ; 0x022E6FBC
bne _022E707C
ldr r1, _022E79EC ; =0x02351594
add r0, sp, #0x48
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
b _022E709C
_022E707C:
cmp r0, #2
add r0, sp, #0x48
bne _022E7094
ldr r1, _022E79F0 ; =0x023515B0
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
b _022E709C
_022E7094:
ldr r1, _022E79F4 ; =0x023515CC
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
_022E709C:
mov r0, #0x65
bl AdvanceFrame
@ -19474,7 +19474,7 @@ _022EBD80:
mov r0, r4
ldr r1, [r1]
str r4, [r1, #0xc4]
bl FUN_01FFBDF4
bl sub_01FFBDF4
bl TryActivateArtificialWeatherAbilities
mov r1, #0
mov r0, r4
@ -19692,7 +19692,7 @@ _022EC0BC:
ldr r1, [r4]
mov r0, r8
str r8, [r1, #0xc4]
bl FUN_01FFBDF4
bl sub_01FFBDF4
bl TryActivateArtificialWeatherAbilities
ldrh r0, [sl]
tst r0, #0x8000
@ -19876,7 +19876,7 @@ _022EC380:
movs sb, r0
moveq r0, #0
ldmeqdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
bl FUN_01FFBDF4
bl sub_01FFBDF4
mov r0, #0
bl DisplayActions
cmp r0, #0
@ -36058,7 +36058,7 @@ _022FA210:
b _022FA27C
_022FA274:
mov r1, r2
bl FUN_01FFA3C4
bl AiMovement
_022FA27C:
add r0, r4, #0x100
ldrsh r1, [r0, #0x7e]
@ -37469,7 +37469,7 @@ _022FB518: .word 0x00000C25
arm_func_start ov29_022FB51C
ov29_022FB51C: ; 0x022FB51C
stmdb sp!, {r3, lr}
bl GetScenarioBalance
bl GetScenarioBalance__0204CB94
cmp r0, #2
movhs r0, #1
movlo r0, #0
@ -37535,7 +37535,7 @@ ov29_022FB5EC: ; 0x022FB5EC
stmdb sp!, {r4, lr}
bl GetSpawnThreshold
mov r4, r0
bl GetScenarioBalance
bl GetScenarioBalance__022E095C
cmp r4, r0
movls r0, #1
movhi r0, #0
@ -42023,7 +42023,7 @@ _022FF368:
b _022FF3A4
_022FF39C:
mov r0, r5
bl FUN_01FFB658
bl ChooseAiMove
_022FF3A4:
mov r0, #1
ldmdb sp!, {r3, r4, r5, pc}
@ -52757,7 +52757,7 @@ _02308450:
cmp r0, #0
bne _02308510
mov r0, r5
bl FUN_01FFB658
bl ChooseAiMove
ldrh r0, [r4, #0x4a]
cmp r0, #0
ldmnedb sp!, {r3, r4, r5, pc}
@ -52775,7 +52775,7 @@ _023084A8:
ldmeqdb sp!, {r3, r4, r5, pc}
mov r0, r5
mov r1, #1
bl FUN_01FFA3C4
bl AiMovement
ldrb r0, [r4, #6]
cmp r0, #0
ldmeqdb sp!, {r3, r4, r5, pc}
@ -52810,14 +52810,14 @@ _0230852C:
beq _02308548
mov r0, r5
mov r1, #1
bl FUN_01FFA3C4
bl AiMovement
_02308548:
ldrh r0, [r4, #0x4a]
cmp r0, #0
cmpne r0, #1
ldmnedb sp!, {r3, r4, r5, pc}
mov r0, r5
bl FUN_01FFB658
bl ChooseAiMove
ldrsh r0, [r4, #2]
bl GetCanMoveFlag
cmp r0, #0
@ -68380,7 +68380,7 @@ _02316074:
bne _02316074
mov r0, r7
mov r1, r4
bl FUN_01FFA3C4
bl AiMovement
add r3, sp, #0
add r2, r8, #0x4a
mov r1, #0xa
@ -70296,7 +70296,7 @@ _02317B70:
add r1, r0, #1
mov r0, r5
strb r1, [r4, #0xf2]
bl FUN_01FFB62C
bl sub_01FFB62C
ldr r0, _02317C14 ; =0x00000115
bl ov29_022EACCC
ldr r2, _02317C18 ; =0x00000D3C
@ -81130,7 +81130,7 @@ _02321008:
mov r1, #0
bl ov29_022E1A40
mov r0, r8
bl FUN_01FFB62C
bl sub_01FFB62C
mov r0, #1
bl ov29_022E2EC4
mov r0, r8
@ -97595,7 +97595,7 @@ _0232EA2C:
mov r1, r4
mov r2, r8
mov r3, #0
bl FUN_01FFBE5C
bl LightningRodStormDrainCheck
movs r5, r0
beq _0232EA6C
bl ov29_022E6338
@ -97612,7 +97612,7 @@ _0232EA6C:
mov r1, r4
mov r2, r8
mov r3, #1
bl FUN_01FFBE5C
bl LightningRodStormDrainCheck
movs r5, r0
beq _0232EAAC
bl ov29_022E6388
@ -123008,7 +123008,7 @@ LoadFixedRoomData: ; 0x02343D90
ldr r1, _02343DC0 ; =0x02353110
ldr r0, [r0]
mov r2, #0
bl LoadFileFromRom
bl LoadFileFromRom__02008C3C
ldr r0, _02343DBC ; =0x02353794
ldr r0, [r0]
ldr r1, [r0], #8

2
asm/overlay_31.s
View File

@ -7777,7 +7777,7 @@ ov31_02389C2C: ; 0x02389C2C
cmp r1, #0
ldmneia sp!, {r3, pc}
mov r1, #1
bl FUN_01FFA3C4
bl AiMovement
ldmdb sp!, {r3, pc}
arm_func_end ov31_02389C2C

1
main.lsf
View File

@ -88,6 +88,7 @@ Autoload ITCM
Object lib/NitroSDK/asm/mi_dma.o (.itcm)
Object lib/NitroSDK/asm/mi_dma_gxcommand.o (.itcm)
Object lib/asm/nitro.o (.itcm)
Object asm/itcm.o (.itcm)
}
Autoload DTCM