Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

correct for two route 10 maps

This commit is contained in:
Bryan Bishop 2012-05-16 14:24:18 -05:00
parent e27cdc43b2
commit dc3fd295c0
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
constants.asm
View File

@ -676,7 +676,8 @@ GROUP_POWER_PLANT EQU $07
GROUP_BILLS_HOUSE EQU $07
GROUP_ROUTE_4 EQU $07
GROUP_ROUTE_9 EQU $07
GROUP_ROUTE_10 EQU $07
GROUP_ROUTE_10A EQU $07
GROUP_ROUTE_10_NORTH EQU $07
GROUP_ROUTE_24 EQU $07
GROUP_ROUTE_25 EQU $07
GROUP_CERULEAN_CITY EQU $07
@ -796,7 +797,8 @@ GROUP_SAFARI_ZONE_WARDENS_HOME EQU $11
GROUP_ROUTE_15_FUCHSIA_GATE EQU $11
GROUP_ROUTE_8 EQU $12
GROUP_ROUTE_12 EQU $12
;GROUP_ROUTE_10 EQU $12
GROUP_ROUTE_10B EQU $12
GROUP_ROUTE_10_SOUTH EQU $12
GROUP_LAVENDER_TOWN EQU $12
GROUP_LAVENDER_POKECENTER_1F EQU $12
GROUP_LAVENDER_POKECENTER_2F_BETA EQU $12
@ -1066,7 +1068,8 @@ MAP_POWER_PLANT EQU $0a
MAP_BILLS_HOUSE EQU $0b
MAP_ROUTE_4 EQU $0c
MAP_ROUTE_9 EQU $0d
MAP_ROUTE_10 EQU $0e
MAP_ROUTE_10A EQU $0e
MAP_ROUTE_10_NORTH EQU $0e
MAP_ROUTE_24 EQU $0f
MAP_ROUTE_25 EQU $10
MAP_CERULEAN_CITY EQU $11
@ -1186,7 +1189,8 @@ MAP_SAFARI_ZONE_WARDENS_HOME EQU $0c
MAP_ROUTE_15_FUCHSIA_GATE EQU $0d
MAP_ROUTE_8 EQU $01
MAP_ROUTE_12 EQU $02
;MAP_ROUTE_10 EQU $03
MAP_ROUTE_10B EQU $03
MAP_ROUTE_10_SOUTH EQU $03
MAP_LAVENDER_TOWN EQU $04
MAP_LAVENDER_POKECENTER_1F EQU $05
MAP_LAVENDER_POKECENTER_2F_BETA EQU $06

22
extras/crystal.py
View File

@ -1188,6 +1188,7 @@ def get_map_constant_label(map_group=None, map_id=None):
"""returns PALLET_TOWN for some map group/id pair"""
if map_group == None: raise Exception, "need map_group"
if map_id == None: raise Exception, "need map_id"
global map_internal_ids
for (id, each) in map_internal_ids.items():
if each["map_group"] == map_group and each["map_id"] == map_id:
@ -1600,6 +1601,23 @@ class MoneyByteParam(MultiByteParam):
return str(z) + "\ndb "+str(y)+"\ndb "+str(x)
def read_money(address, dohex=False):
z = ord(rom[address])
y = ord(rom[address+1])
x = ord(rom[address+2])
answer = x + (y << 8) + (z << 16)
if not dohex:
return answer
else:
return hex(answer)
def write_money(money):
value = money
x = (value & 0x0000FF)
y = (value & 0x00FF00) >> 8
z = (value & 0xFF0000) >> 16
return "db "+str(z)+"\ndb "+str(y)+"\ndb "+str(x)
class CoinByteParam(MultiByteParam):
size = 2
max_value = 0x270F
@ -5007,7 +5025,7 @@ map_names = {
0xB: {"name": "Bill's House"},
0xC: {"name": "Route 4"},
0xD: {"name": "Route 9"},
0xE: {"name": "Route 10"},
0xE: {"name": "Route 10 North"},
0xF: {"name": "Route 24"},
0x10: {"name": "Route 25"},
0x11: {"name": "Cerulean City"},
@ -5166,7 +5184,7 @@ map_names = {
18: {
0x1: {"name": "Route 8"},
0x2: {"name": "Route 12"},
0x3: {"name": "Route 10"},
0x3: {"name": "Route 10 South"},
0x4: {"name": "Lavender Town"},
0x5: {"name": "Lavender Pokémon Center 1F",
"label": "LavenderPokeCenter1F"},