Leahnaya/DS-Pokemon-Rom-Editor
1
0
Fork 0
mirror of https://github.com/AdAstra-LD/DS-Pokemon-Rom-Editor.git synced 2026-09-09 11:45:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Eye contact music write

Browse Source
This commit is contained in:
AdAstra-LD
2024-05-12 23:24:57 +02:00
parent c0083461a9
commit bbad3ce3e2
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DS_Map/Main Window.cs
View File

@@ -7767,11 +7767,8 @@ namespace DSPRE {
trainerClassEncounterMusicDict = new Dictionary<byte, (uint entryOffset, ushort musicD, ushort? musicN)>();
uint encounterMusicTableTableStartAddress = BitConverter.ToUInt32(ARM9.ReadBytes(RomInfo.encounterMusicTableOffsetToRAMAddress, 4), 0) - ARM9.address;
uint entrySize = 4;
uint tableSizeOffset = 10;
if (gameFamily == GameFamilies.HGSS) {
entrySize += 2;
tableSizeOffset += 2;
encounterSSEQAltUpDown.Enabled = true;
}
@@ -8536,10 +8533,16 @@ namespace DSPRE {
byte b_selectedTrClass = (byte)selectedTrClass;
ushort eyeMusicID = (ushort)encounterSSEQMainUpDown.Value;
ushort altEyeMusicID = (ushort)encounterSSEQAltUpDown.Value;
if (trainerClassEncounterMusicDict.TryGetValue(b_selectedTrClass, out var dictEntry)) {
ARM9.WriteBytes(BitConverter.GetBytes(eyeMusicID), dictEntry.entryOffset);
trainerClassEncounterMusicDict[b_selectedTrClass] = (dictEntry.entryOffset, eyeMusicID, dictEntry.musicN);
ARM9.WriteBytes(BitConverter.GetBytes(eyeMusicID), dictEntry.entryOffset + 2);
if (gameFamily.Equals(GameFamilies.HGSS)) {
ARM9.WriteBytes(BitConverter.GetBytes(altEyeMusicID), dictEntry.entryOffset + 4);
}
trainerClassEncounterMusicDict[b_selectedTrClass] = (dictEntry.entryOffset, eyeMusicID, altEyeMusicID);
}
string newName = trainerClassNameTextbox.Text;