Leahnaya/pokemon-reverse-engineering-tools
1
0
Fork 0
mirror of https://github.com/pret/pokemon-reverse-engineering-tools.git synced 2026-08-20 01:04:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #42 from yenatch/script-commands

Browse Source 
rename some event script commands
This commit is contained in:
Bryan Bishop
2013-09-30 21:43:28 -07:00
parent f3fb1f24ea bcb3295dbd
commit 1089cf99d0
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pokemontools/crystal.py
View File

@@ -2178,8 +2178,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]],
@@ -2220,14 +2220,14 @@ 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]],
0x37: ["wildoff"],
0x38: ["wildon"],
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]],
0x3A: ["warpmod", ["warp_id", SingleByteParam], ["map_group", MapGroupParam], ["map_id", MapIdParam]],
0x3B: ["blackoutmod", ["map_group", MapGroupParam], ["map_id", MapIdParam]],
@@ -2340,12 +2340,11 @@ 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: ["wait", ["unknown", SingleByteParam]],
0xA9: ["unknown0xa9"],
0xAA: ["unknown0xaa"],
}
def create_command_classes(debug=False):
"""creates some classes for each command byte"""
@@ -2626,7 +2625,7 @@ effect_commands = {
0xa7: ['effect0xa7'],
0xa8: ['effect0xa8'],
0xa9: ['clearmissdamage'],
0xaa: ['wait'],
0xaa: ['movedelay'],
0xab: ['hittarget'],
0xac: ['tristatuschance'],
0xad: ['supereffectivelooptext'],