ref: dc3fd295c0397fbbaafb13bc02524e86f67c67ac
parent: e27cdc43b2995e63e0d7aff5c252f1de6e799986
author: Bryan Bishop <[email protected]>
date: Wed May 16 10:24:18 EDT 2012
correct for two route 10 maps
--- a/constants.asm
+++ b/constants.asm
@@ -676,7 +676,8 @@
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_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_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_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
--- a/extras/crystal.py
+++ b/extras/crystal.py
@@ -1188,6 +1188,7 @@
"""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 @@
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 @@
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 @@
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"},