From b9ee8a09368c81b869e31e891c6488602429ef05 Mon Sep 17 00:00:00 2001
From: JimB16 <f1@jimb.de>
Date: Mon, 19 Oct 2015 16:01:40 +0200
Subject: [PATCH] improved some macro names

---
 pokemontools/crystal.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pokemontools/crystal.py b/pokemontools/crystal.py
index 967e64a..825b0e1 100644
--- a/pokemontools/crystal.py
+++ b/pokemontools/crystal.py
@@ -2578,7 +2578,7 @@ class DutyCycleByteParam():
     def from_asm(value):
         return value
 
-class AbsNoteByteParam():
+class TransposeByteParam():
     """or SingleByte(CommandParam)"""
     size = 1
     should_be_decimal = False
@@ -2736,20 +2736,20 @@ music_commands = {
     0xD6: ["octave 2"],
     0xD7: ["octave 1"],
     0xD8: ["notetype", ["note_length", SingleByteParam], ["volenvelope", VolEnvelopeByteParam]], # no volenvelope on channel 4/8
-    0xD9: ["setabsnote", ["absnote", AbsNoteByteParam]],
+    0xD9: ["transpose", ["transpose", TransposeByteParam]],
     0xDA: ["tempo", ["tempo", DecimalBigEndianParam]],
-    0xDB: ["setwaveduty", ["wave_duty", SingleByteParam]],
+    0xDB: ["waveduty", ["wave_duty", SingleByteParam]],
     0xDC: ["volenvelope", ["volenvelope", VolEnvelopeByteParam]],
-    0xDD: ["setsweep", ["sweep", SweepByteParam]],
+    0xDD: ["sweep", ["sweep", SweepByteParam]],
     0xDE: ["dutycycle", ["dutycycle", DutyCycleByteParam]],
     0xDF: ["togglesfx"],
     0xE0: ["pitchbend", ["unknown", SingleByteParam], ["unknown", PitchBendByteParam]],
     0xE1: ["vibrato", ["delay", SingleByteParam], ["extent", VibratoByteParam]],
     0xE2: ["unknownmusic0xe2", ["unknown", SingleByteParam]],
-    0xE3: ["togglenoise", ["id", SingleByteParam]], # no parameters on toggle off
+    0xE3: ["drumkittoggle", ["id", SingleByteParam]], # no parameters on toggle off
     0xE4: ["panning", ["tracks", SingleByteParam]],
     0xE5: ["volume", ["volume", VolumeByteParam]],
-    0xE6: ["setpitchoffset", ["setpitchoffset", BigEndianParam]],
+    0xE6: ["pitchoffset", ["pitchoffset", BigEndianParam]],
     0xE7: ["unknownmusic0xe7", ["unknown", SingleByteParam]],
     0xE8: ["unknownmusic0xe8", ["unknown", SingleByteParam]],
     0xE9: ["addtempo", ["value", DecimalBigEndianParam]],
@@ -2759,7 +2759,7 @@ music_commands = {
     0xED: ["sfxpriorityoff"],
     0xEE: ["conditionaljump", ["address", PointerLabelParam]],
     0xEF: ["stereopanning", ["tracks", SingleByteParam]],
-    0xF0: ["sfxtogglenoise", ["id", SingleByteParam]], # no parameters on toggle off
+    0xF0: ["sfxdrumkittoggle", ["id", SingleByteParam]], # no parameters on toggle off
     0xF1: ["music0xf1"], # nothing
     0xF2: ["music0xf2"], # nothing
     0xF3: ["music0xf3"], # nothing
@@ -2769,7 +2769,7 @@ music_commands = {
     0xF7: ["music0xf7"], # nothing
     0xF8: ["music0xf8"], # nothing
     0xF9: ["unknownmusic0xf9"],
-    0xFA: ["setcondition", ["condition", SingleByteParam]],
+    0xFA: ["condition", ["condition", SingleByteParam]],
     0xFB: ["jumpif", ["condition", SingleByteParam], ["address", PointerLabelParam]],
     0xFC: ["jumpchannel", ["address", PointerLabelParam]],
     0xFD: ["loopchannel", ["count", DecimalParam], ["address", PointerLabelParam]],
@@ -2780,7 +2780,7 @@ music_commands = {
 music_command_enders = [
     "restartchannel",
     "newsong",
-    "unknownmusic0xee",
+    "conditionaljump",
     "jumpchannel",
     "endchannel",
 ]