Skip to content

Commit

Permalink
Merge pull request #63 from AnonymousRandomPerson/main
Browse files Browse the repository at this point in the history
Synced from pmdsky-debug
  • Loading branch information
AnonymousRandomPerson authored Mar 25, 2024
2 parents 37ddf03 + 65777ed commit 2235b79
Show file tree
Hide file tree
Showing 42 changed files with 99 additions and 99 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/onCreate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ WORKSPACE="$1"
cd /tmp

if [ ! -d "$WORKSPACE/tools/mwccarm" ]; then
wget https://cdn.discordapp.com/attachments/698589325620936736/845499146982129684/mwccarm.zip
wget https://github.com/pret/pmd-sky/raw/workflows/assets/mwccarm.zip
unzip mwccarm.zip
mv -v mwccarm "$WORKSPACE/tools"
fi
Expand All @@ -15,7 +15,7 @@ if [ ! -d "$WORKSPACE/tools/bin" \
-o ! -f "$WORKSPACE/sub/ARM7-TS.lcf.template" \
-o ! -f "$WORKSPACE/ARM9-TS.lcf.template" \
-o ! -f "$WORKSPACE/mwldarm.response.template" ]; then
wget https://cdn.discordapp.com/attachments/698589325620936736/722822401963851797/NitroSDK-3_2-060901.7z
wget https://github.com/pret/pmd-sky/raw/workflows/assets/NitroSDK-4_2-071210-jp.7z
7z x NitroSDK-3_2-060901.7z
rm -rf "$WORKSPACE/tools/bin"
mv -v NitroSDK-3_2-060901/tools/bin "$WORKSPACE/tools"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ jobs:
run: |
mkdir -p ~/download
cd ~/download
wget https://cdn.discordapp.com/attachments/698589325620936736/845499146982129684/mwccarm.zip
wget https://cdn.discordapp.com/attachments/855279572651868170/875195363261292604/NitroSDK-4_2-071210-jp.7z
wget https://github.com/pret/pmd-sky/raw/workflows/assets/mwccarm.zip
wget https://github.com/pret/pmd-sky/raw/workflows/assets/NitroSDK-4_2-071210-jp.7z
unzip mwccarm.zip
mv mwccarm $GITHUB_WORKSPACE/tools
7z x NitroSDK-4_2-071210-jp.7z
Expand Down
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ To install the compiler and SDK needed for this project, run `make install_toolc
If you have issues with the `make` command above, you can also install the compiler and SDK manually.

### Manual installation
The build system requires the use of the Metrowerks C Compiler versions 2.0/sp2p2 to compile matching files. Join the pret Discord, download the pinned `mwccarm.zip` zip in `#pokediamond`, and extract it to `tools/`. At the end of this operation, you should have the file `tools/mwccarm/2.0/sp2p2/mwccarm.exe`.
The build system requires the use of the Metrowerks C Compiler versions 2.0/sp2p2 to compile matching files. Download [mwccarm.zip](https://github.com/pret/pmd-sky/raw/workflows/assets/mwccarm.zip), and extract it to `tools/`. At the end of this operation, you should have the file `tools/mwccarm/2.0/sp2p2/mwccarm.exe`.

For Nitro SDK, download the `NitroSDK-4_2-071210-jp.7z` file pinned in the pret Discord in `#pokeheartgold`. Extract and copy the folder `tools/bin` from the Nitro SDK into the folder `tools` in your `pmd-sky` clone. At the end of this operation, you should have the file `tools/bin/makelcf.exe` inside your `pmd-sky` clone. Finally, copy `include/nitro/specfiles/ARM7-TS.lcf.template` into the subdirectory `sub`, and `include/nitro/specfiles/ARM9-TS.lcf.template` and `include/nitro/specfiles/mwldarm.response.template` into the project root.
For Nitro SDK, download [NitroSDK-4_2-071210-jp.7z](https://github.com/pret/pmd-sky/raw/workflows/assets/NitroSDK-4_2-071210-jp.7z). Extract and copy the folder `tools/bin` from the Nitro SDK into the folder `tools` in your `pmd-sky` clone. At the end of this operation, you should have the file `tools/bin/makelcf.exe` inside your `pmd-sky` clone. Finally, copy `include/nitro/specfiles/ARM7-TS.lcf.template` into the subdirectory `sub`, and `include/nitro/specfiles/ARM9-TS.lcf.template` and `include/nitro/specfiles/mwldarm.response.template` into the project root.

## 2. Dependencies

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ compare: @$(MAKE) COMPARE=1
install_toolchain:
rm -rf toolchain_tmp
mkdir -p toolchain_tmp
wget https://cdn.discordapp.com/attachments/698589325620936736/845499146982129684/mwccarm.zip -O toolchain_tmp/mwccarm.zip
wget https://cdn.discordapp.com/attachments/855279572651868170/875195363261292604/NitroSDK-4_2-071210-jp.7z -O toolchain_tmp/NitroSDK-4_2-071210-jp.7z
wget https://github.com/pret/pmd-sky/raw/workflows/assets/mwccarm.zip -O toolchain_tmp/mwccarm.zip
wget https://github.com/pret/pmd-sky/raw/workflows/assets/NitroSDK-4_2-071210-jp.7z -O toolchain_tmp/NitroSDK-4_2-071210-jp.7z
unzip -o toolchain_tmp/mwccarm.zip -d tools
7z x toolchain_tmp/NitroSDK-4_2-071210-jp.7z -otoolchain_tmp/nitro_sdk -y
mv toolchain_tmp/nitro_sdk/tools/bin/* tools/bin
Expand Down
2 changes: 1 addition & 1 deletion asm/include/main_02075600.inc
Original file line number Diff line number Diff line change
Expand Up @@ -1770,6 +1770,7 @@
.public DseTrackEvent_WaitDelta
.public DseTrackEvent_WaitSame
.public DseTrackEvent_WaitUntilFadeout
.public DseUtil_GetRandomNumber
.public DTCM_BSS
.public FX_AtanIdxTable_
.public GetKeyM2N
Expand Down Expand Up @@ -1814,7 +1815,6 @@
.public SoundLfoWave_InvalidFunc
.public SoundLfoWave_ReverseSawFunc
.public SoundLfoWave_SawFunc
.public DseUtil_GetRandomNumber
.public sSubBGExtPltt
.public sTexPlttStartAddrTable
.public sTexStartAddrTable
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_022E1A40.inc
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
.public EntityIsValid__022E1A1C
.public EntityIsValid__022E32E8
.public GetForcedLossReason
.public GetIdleAnimationId
.public GetMonsterApparentId
.public GetMonsterName
.public GetSleepAnimationId
.public GetSpriteSize
.public GetTileSafe
.public HasDropeyeStatus
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_29_022E37DC.inc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
.public AnimationHasMoreFrames
.public CanMonsterSpawn
.public ChangeDungeonMusic
.public ChangeMonsterAnimation
.public CheckActiveChallengeRequest
.public CheckSpawnThreshold
.public CloseTextBox2
Expand All @@ -25,6 +26,7 @@
.public FloorNumberIsEven
.public GetEffectAnimationField0x19
.public GetFloorType
.public GetIdleAnimationId
.public GetItemCategoryVeneer
.public GetKecleonIdToSpawnByFloor
.public GetMonsterGenderVeneer
Expand All @@ -34,7 +36,6 @@
.public GetNbPrecedingFloors
.public GetNbRecruited
.public GetSecondFormIfValid
.public GetSleepAnimationId
.public GetSpriteFileSize
.public GetSpriteSize
.public GetTile
Expand Down Expand Up @@ -94,7 +95,6 @@
.public ov29_022ED0F4
.public ov29_022F42D8
.public ov29_0230027C
.public ov29_023049A8
.public ov29_0230D618
.public ov29_02339138
.public ov29_02339148
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_022EE36C.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
.public ATK_STAT_IDX
.public BAG_ITEMS_PTR_MIRROR
.public CalcStatusDuration
.public ChangeMonsterAnimation
.public DIRECTIONS_XY
.public DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST
.public DrawMinimapTile
Expand Down Expand Up @@ -55,7 +56,6 @@
.public ov29_022FA574
.public ov29_022FB920
.public ov29_022FBD80
.public ov29_023049A8
.public ov29_02304A48
.public ov29_02344B44
.public ov29_02346344
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_29_022F05B4.inc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
.public CanMonsterMoveInDirection
.public CanSeeTarget
.public CeilFixedPoint
.public ChangeMonsterAnimation
.public CheckTeamItemsFlags
.public CheckTouchscreenArea
.public CloseTextBox
Expand All @@ -28,6 +29,7 @@
.public GetEntityMoveTargetAndRange
.public GetEquippedThrowableItem
.public GetHero
.public GetIdleAnimationId
.public GetItemCategoryVeneer
.public GetItemIndex
.public GetItemInfo
Expand All @@ -37,7 +39,6 @@
.public GetMoneyCarried
.public GetMonsterGenderVeneer
.public GetPressedButtons
.public GetSleepAnimationId
.public GetTeamMemberIndex
.public GetTile
.public GetTileAtEntity
Expand Down Expand Up @@ -113,7 +114,6 @@
.public ov29_0230105C
.public ov29_02301158
.public ov29_0230175C
.public ov29_023049A8
.public ov29_023055B0
.public ov29_02321164
.public ov29_02322DDC
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_022F52B0.inc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
.public ApplyItemEffect
.public AreMovesEnabled
.public CanMonsterUseItem
.public ChangeMonsterAnimation
.public CheckTeamMemberIdxVeneer
.public DecrementStackItem
.public DIRECTIONS_XY
Expand Down Expand Up @@ -55,7 +56,6 @@
.public ov29_02300818
.public ov29_023009CC
.public ov29_0230175C
.public ov29_023049A8
.public ov29_02304A48
.public ov29_02304AFC
.public ov29_02307BDC
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_29_022F7388.inc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
.public CanSeeTarget
.public CASTFORM_WEATHER_ATTRIBUTE_TABLE
.public CeilFixedPoint
.public ChangeMonsterAnimation
.public CheckTeamMemberIdx
.public Conversion2IsActive
.public DeleteWanTableEntryVeneer
Expand Down Expand Up @@ -53,6 +54,7 @@
.public GetExplorerMazeMonster
.public GetFloorType
.public GetForcedLossReason
.public GetIdleAnimationId
.public GetLeader
.public GetLearnableIqSkills
.public GetLvlUpEntry
Expand All @@ -77,7 +79,6 @@
.public GetOutlawSpawnData
.public GetScenarioBalance
.public GetScenarioBalanceVeneer
.public GetSleepAnimationId
.public GetSpawnThreshold
.public GetSpriteFileSize
.public GetSpriteIndex__020526EC
Expand Down Expand Up @@ -162,7 +163,6 @@
.public ov29_023018AC
.public ov29_023021F0
.public ov29_02304830
.public ov29_023049A8
.public ov29_02304A48
.public ov29_02304BAC
.public ov29_02307CE0
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_29_02302A5C.inc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once
.public _020AFC4C
.public ChangeMonsterAnimation
.public DIRECTIONS_XY
.public DisplayMessage
.public DisplayMessage2
Expand All @@ -10,13 +11,13 @@
.public EntityIsValid__023047B8
.public FormatMoveString
.public GetEncodedHalfword
.public GetIdleAnimationId
.public GetLeader
.public GetLoadedAttackSpriteId
.public GetLvlUpEntry
.public GetMonsterName
.public GetMovesetLevelUpPtr
.public GetPersonalityIndex
.public GetSleepAnimationId
.public GetStringFromFileVeneer
.public GetTalkLine
.public GetTile
Expand Down Expand Up @@ -48,7 +49,6 @@
.public ov29_023009CC
.public ov29_023021F0
.public ov29_02304830
.public ov29_023049A8
.public ov29_02318D58
.public ov29_0231EA04
.public ov29_02338988
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_29_023055B0.inc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once
.public AbilityIsActiveVeneer
.public CalcSpeedStageWrapper
.public ChangeMonsterAnimation
.public DUNGEON_PTR
.public EndBlinkerClassStatus
.public EndBurnClassStatus
Expand All @@ -15,8 +16,8 @@
.public EntityIsValid__0230558C
.public EntityIsValid__02305C04
.public GetDirectionTowardsPosition
.public GetIdleAnimationId
.public GetLeader
.public GetSleepAnimationId
.public GetTileAtEntity
.public GetTrapInfo
.public HasHeldItem
Expand All @@ -41,7 +42,6 @@
.public ov29_022EA370
.public ov29_022FBE04
.public ov29_02300818
.public ov29_023049A8
.public ov29_02337D68
.public ov29_02353318
.public SubstitutePlaceholderStringTags
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_02305C28.inc
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
.public EntityIsValid__02305C04
.public EntityIsValid__02307EF8
.public FreeOtherWrappedMonsters
.public GetIdleAnimationId
.public GetMonsterApparentId
.public GetSleepAnimationId
.public GetType
.public IsProtectedFromNegativeStatus
.public ItemIsActive__02307F1C
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_29_02308FE0.inc
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
.public CanSeeTarget
.public CeilFixedPoint
.public ChangeDungeonMusic
.public ChangeMonsterAnimation
.public ClampedLn
.public CLOUDY_DAMAGE_MULTIPLIER
.public DAMAGE_FORMULA_AT_PREFACTOR
Expand Down Expand Up @@ -67,6 +68,7 @@
.public GetEquivItemIndex
.public GetExp
.public GetFirstEmptyMemberIdx
.public GetIdleAnimationId
.public GetItemAtIdx
.public GetKecleonIdToSpawnByFloor
.public GetMonsterGenderVeneer
Expand All @@ -77,7 +79,6 @@
.public GetRandomMovementChance
.public GetRecruitRate1
.public GetRecruitRate2
.public GetSleepAnimationId
.public GetTile
.public GetTileAtEntity
.public GravityIsActive
Expand Down Expand Up @@ -183,7 +184,6 @@
.public ov29_0230040C
.public ov29_02303E0C
.public ov29_02304830
.public ov29_023049A8
.public ov29_02304A48
.public ov29_02305F60
.public ov29_02307BDC
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_0231513C.inc
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
.public EntityIsValid__02318D34
.public ExclusiveItemEffectIsActiveWithLogging
.public GetFloorType
.public GetIdleAnimationId
.public GetMaxPp
.public GetMaxPpWrapper
.public GetMobilityType
.public GetMonsterApparentId
.public GetMonsterIdFromSpawnEntry
.public GetNameWithGender
.public GetSleepAnimationId
.public GravityIsActive
.public HasHeldItem
.public HasTypeAffectedByGravity
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_0231B1B8.inc
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
.public FemaleToMaleForm
.public GEO_PEBBLE_DAMAGE
.public GetActiveTeamMember
.public GetIdleAnimationId
.public GetItemCategoryVeneer
.public GetSleepAnimationId
.public GOLD_FANG_POWER
.public GOLD_THORN_POWER
.public GRAVELEROCK_DAMAGE
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_0231EDFC.inc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
.public AdvanceFrame
.public CalcDamageFixedNoCategory
.public CanSeeTarget
.public ChangeMonsterAnimation
.public DIRECTIONS_XY
.public DUNGEON_PTR
.public DungeonRandInt
Expand All @@ -21,7 +22,6 @@
.public ov29_022EACCC
.public ov29_022FF764
.public ov29_0230175C
.public ov29_023049A8
.public ov29_02304A48
.public ov29_0232033C
.public ov29_02321238
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_0231FC20.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
.public AdvanceFrame
.public AreTileJumpsAllowed
.public CalcDamageFixedNoCategory
.public ChangeMonsterAnimation
.public DIRECTIONS_XY
.public DUNGEON_PTR
.public EnsureCanStandCurrentTile
Expand All @@ -17,7 +18,6 @@
.public ov29_022E56A0
.public ov29_022F9C74
.public ov29_022FFB90
.public ov29_023049A8
.public ov29_02307BDC
.public ov29_0232033C
.public ov29_02321238
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_0232145C.inc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
.public AreEntitiesAdjacent
.public BoostSpeedOneStage
.public CalcStatusDuration
.public ChangeMonsterAnimation
.public DETECT_BAND_MOVE_ACCURACY_DROP
.public DIRECTIONS_XY
.public DUNGEON_PTR
Expand Down Expand Up @@ -104,7 +105,6 @@
.public ov29_02300DCC
.public ov29_0230175C
.public ov29_023024E0
.public ov29_023049A8
.public ov29_02304A48
.public ov29_02304B14
.public ov29_02318D58
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_02328030.inc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
.public CalcDamage
.public CalcDamageFixedWrapper
.public CalcRecoilDamageFixed
.public ChangeMonsterAnimation
.public DealDamage
.public DIVE_DAMAGE_MULTIPLIER
.public DoMoveTakeaway
Expand Down Expand Up @@ -57,7 +58,6 @@
.public ov29_022ECAFC
.public ov29_022F9EA0
.public ov29_0230040C
.public ov29_023049A8
.public ov29_0230D4A4
.public ov29_02318A90
.public ov29_02318AD4
Expand Down
Loading

0 comments on commit 2235b79

Please sign in to comment.