diff options
author | Sanky <gsanky@gmail.com> | 2013-02-02 23:13:32 +0100 |
---|---|---|
committer | Sanky <gsanky@gmail.com> | 2013-02-02 23:20:50 +0100 |
commit | 7df002c3e20f1b728b1d29a877c3731d4867f502 (patch) | |
tree | 14cf8cb4dc2a95f4137de1967679dd45df3c0db8 /extras/pksv.py | |
parent | 6b8d77ffb23443cac8ca8bc570c758f7b77fa109 (diff) | |
parent | 1bf1d6e3ea7b75445803ed8d01c49014adf2e114 (diff) |
Merge https://github.com/kanzure/pokecrystal
Conflicts:
constants.asm
extras/crystal.py
main.asm
Diffstat (limited to 'extras/pksv.py')
-rw-r--r-- | extras/pksv.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/extras/pksv.py b/extras/pksv.py index 8f4bafeeb..03ad2d077 100644 --- a/extras/pksv.py +++ b/extras/pksv.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- pksv_gs = { 0x00: "2call", @@ -34,7 +35,7 @@ pksv_gs = { 0x21: "checkitem", 0x22: "givemoney", 0x23: "takemoney", - 0x24: "checkmonkey", + 0x24: "checkmoney", 0x25: "givecoins", 0x26: "takecoins", 0x27: "checkcoins", @@ -141,8 +142,8 @@ pksv_gs = { 0xA3: "displaylocation", } -#see http://www.pokecommunity.com/showpost.php?p=4347261 -#NOTE: this has some updates that need to be back-ported to gold +# see http://www.pokecommunity.com/showpost.php?p=4347261 +# NOTE: this has some updates that need to be back-ported to gold pksv_crystal = { 0x00: "2call", 0x01: "3call", @@ -179,7 +180,7 @@ pksv_crystal = { 0x21: "checkitem", 0x22: "givemoney", 0x23: "takemoney", - 0x24: "checkmonkey", + 0x24: "checkmoney", 0x25: "givecoins", 0x26: "takecoins", 0x27: "checkcoins", @@ -292,13 +293,14 @@ pksv_crystal = { } #these cause the script to end; used in create_command_classes -pksv_crystal_more_enders = [0x03, 0x04, 0x05, 0x0C, 0x51, 0x53, - 0x8D, 0x8F, 0x90, 0x91, 0x92, 0x9B, +pksv_crystal_more_enders = [0x03, 0x04, 0x05, 0x0C, 0x51, 0x52, + 0x53, 0x8D, 0x8F, 0x90, 0x91, 0x92, + 0x9B, 0xB2, #maybe? 0xCC, #maybe? ] -#these have no pksv names as of pksv 2.1.1 +# these have no pksv names as of pksv 2.1.1 pksv_crystal_unknowns = [ 0x9F, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, |