From 918adb82ba054477dacbc4c088f0acfe9961ac24 Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 24 Sep 2013 03:24:29 -0400 Subject: script commands wildon and wildoff got mixed up this was a mistake in the original pksv spec and tauwasser's notes --- pokemontools/crystal.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pokemontools/crystal.py b/pokemontools/crystal.py index 8a12dad..25ad6f7 100644 --- a/pokemontools/crystal.py +++ b/pokemontools/crystal.py @@ -2743,8 +2743,8 @@ pksv_crystal_more = { 0x34: ["checkbit2", ["bit_number", MultiByteParam]], 0x35: ["clearbit2", ["bit_number", MultiByteParam]], 0x36: ["setbit2", ["bit_number", MultiByteParam]], - 0x37: ["wildoff"], - 0x38: ["wildon"], + 0x37: ["wildon"], + 0x38: ["wildoff"], 0x39: ["xycompare", ["pointer", MultiByteParam]], 0x3A: ["warpmod", ["warp_id", SingleByteParam], ["map_group", MapGroupParam], ["map_id", MapIdParam]], 0x3B: ["blackoutmod", ["map_group", MapGroupParam], ["map_id", MapIdParam]], -- cgit v1.2.3 From 46f1a2e1c3f4d1feeeeb3214f59fccf635415f8f Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 24 Sep 2013 03:28:55 -0400 Subject: rename bit1/bit2 script commands to event/flag --- pokemontools/crystal.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pokemontools/crystal.py b/pokemontools/crystal.py index 25ad6f7..d93540b 100644 --- a/pokemontools/crystal.py +++ b/pokemontools/crystal.py @@ -2737,12 +2737,12 @@ pksv_crystal_more = { 0x2E: ["giveegg", ["pkmn", PokemonParam], ["level", DecimalParam]], 0x2F: ["givepokeitem", ["pointer", PointerParamToItemAndLetter]], 0x30: ["checkpokeitem", ["pointer", PointerParamToItemAndLetter]], # not pksv - 0x31: ["checkbit1", ["bit_number", MultiByteParam]], - 0x32: ["clearbit1", ["bit_number", MultiByteParam]], - 0x33: ["setbit1", ["bit_number", MultiByteParam]], - 0x34: ["checkbit2", ["bit_number", MultiByteParam]], - 0x35: ["clearbit2", ["bit_number", MultiByteParam]], - 0x36: ["setbit2", ["bit_number", MultiByteParam]], + 0x31: ["checkevent", ["bit_number", MultiByteParam]], + 0x32: ["clearevent", ["bit_number", MultiByteParam]], + 0x33: ["setevent", ["bit_number", MultiByteParam]], + 0x34: ["checkflag", ["bit_number", MultiByteParam]], + 0x35: ["clearflag", ["bit_number", MultiByteParam]], + 0x36: ["setflag", ["bit_number", MultiByteParam]], 0x37: ["wildon"], 0x38: ["wildoff"], 0x39: ["xycompare", ["pointer", MultiByteParam]], -- cgit v1.2.3 From f4b04ff8e90f49a8ad021b7b7229a9a47a087c06 Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 26 Sep 2013 18:22:27 -0400 Subject: if_greater_than and if_less_than commands were swapped --- pokemontools/crystal.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pokemontools/crystal.py b/pokemontools/crystal.py index d93540b..bf67ee5 100644 --- a/pokemontools/crystal.py +++ b/pokemontools/crystal.py @@ -2695,8 +2695,8 @@ pksv_crystal_more = { 0x07: ["if not equal", ["byte", SingleByteParam], ["pointer", ScriptPointerLabelParam]], 0x08: ["iffalse", ["pointer", ScriptPointerLabelParam]], 0x09: ["iftrue", ["pointer", ScriptPointerLabelParam]], - 0x0A: ["if less than", ["byte", SingleByteParam], ["pointer", ScriptPointerLabelParam]], - 0x0B: ["if greater than", ["byte", SingleByteParam], ["pointer", ScriptPointerLabelParam]], + 0x0A: ["if greater than", ["byte", SingleByteParam], ["pointer", ScriptPointerLabelParam]], + 0x0B: ["if less than", ["byte", SingleByteParam], ["pointer", ScriptPointerLabelParam]], 0x0C: ["jumpstd", ["predefined_script", MultiByteParam]], 0x0D: ["callstd", ["predefined_script", MultiByteParam]], 0x0E: ["3callasm", ["asm", AsmPointerParam]], -- cgit v1.2.3 From 7268b91c23ec6a2c98348022a0d91ab3d881b153 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 30 Sep 2013 20:41:16 -0400 Subject: fix up the last few event scirpt commands --- pokemontools/crystal.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pokemontools/crystal.py b/pokemontools/crystal.py index bf67ee5..06d9139 100644 --- a/pokemontools/crystal.py +++ b/pokemontools/crystal.py @@ -2857,10 +2857,10 @@ pksv_crystal_more = { 0xA2: ["credits"], 0xA3: ["warpfacing", ["facing", SingleByteParam], ["map_group", MapGroupParam], ["map_id", MapIdParam], ["x", SingleByteParam], ["y", SingleByteParam]], 0xA4: ["storetext", ["pointer", PointerLabelBeforeBank], ["memory", SingleByteParam]], - 0xA5: ["displaylocation", ["id", SingleByteParam]], - 0xA6: ["unknown0xa6"], - 0xA7: ["unknown0xa7"], - 0xA8: ["unknown0xa8", ["unknown", SingleByteParam]], + 0xA5: ["displaylocation", ["id", SingleByteParam], ["memory", SingleByteParam]], + 0xA6: ["trainerclassname", ["id", SingleByteParam]], + 0xA7: ["name", ["type", SingleByteParam], ["id", SingleByteParam]], + 0xA8: ["waitframes", ["unknown", SingleByteParam]], 0xA9: ["unknown0xa9"], 0xAA: ["unknown0xaa"], } -- cgit v1.2.3 From a0397cad2854ce3a2eb1861d23c552596e4e9802 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 30 Sep 2013 20:41:44 -0400 Subject: event script command 0xaa doesnt exist --- pokemontools/crystal.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pokemontools/crystal.py b/pokemontools/crystal.py index 06d9139..ca44965 100644 --- a/pokemontools/crystal.py +++ b/pokemontools/crystal.py @@ -2862,7 +2862,6 @@ pksv_crystal_more = { 0xA7: ["name", ["type", SingleByteParam], ["id", SingleByteParam]], 0xA8: ["waitframes", ["unknown", SingleByteParam]], 0xA9: ["unknown0xa9"], - 0xAA: ["unknown0xaa"], } def create_command_classes(debug=False): """creates some classes for each command byte""" -- cgit v1.2.3 From bcb3295dbd4bcc063e0f6f59a8cf2de9eb53e981 Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 1 Oct 2013 00:36:39 -0400 Subject: use 'wait' for events instead of move effects --- pokemontools/crystal.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pokemontools/crystal.py b/pokemontools/crystal.py index ca44965..c95b705 100644 --- a/pokemontools/crystal.py +++ b/pokemontools/crystal.py @@ -2860,7 +2860,7 @@ pksv_crystal_more = { 0xA5: ["displaylocation", ["id", SingleByteParam], ["memory", SingleByteParam]], 0xA6: ["trainerclassname", ["id", SingleByteParam]], 0xA7: ["name", ["type", SingleByteParam], ["id", SingleByteParam]], - 0xA8: ["waitframes", ["unknown", SingleByteParam]], + 0xA8: ["wait", ["unknown", SingleByteParam]], 0xA9: ["unknown0xa9"], } def create_command_classes(debug=False): @@ -3142,7 +3142,7 @@ effect_commands = { 0xa7: ['effect0xa7'], 0xa8: ['effect0xa8'], 0xa9: ['clearmissdamage'], - 0xaa: ['wait'], + 0xaa: ['movedelay'], 0xab: ['hittarget'], 0xac: ['tristatuschance'], 0xad: ['supereffectivelooptext'], -- cgit v1.2.3