mirror of
https://github.com/pret/pokemon-reverse-engineering-tools.git
synced 2026-08-09 18:57:29 -05:00
Merge pull request #58 from kanzure/map-editor-stuff
Minor map editor changes
This commit is contained in:
commit
4294fdc140
|
|
@ -128,6 +128,7 @@ def get_constants(config=config):
|
|||
name, value = [s.strip() for s in line.split(' EQU ')]
|
||||
constants[name] = eval(value.split(';')[0].replace('$','0x').replace('%','0b'))
|
||||
config.constants = constants
|
||||
return constants
|
||||
|
||||
class Application(Frame):
|
||||
def __init__(self, master=None, config=config):
|
||||
|
|
@ -149,10 +150,10 @@ class Application(Frame):
|
|||
self.picker_frame = Frame(self)
|
||||
self.picker_frame.grid(row=1, column=1)
|
||||
|
||||
self.new = Button(self.button_frame)
|
||||
self.new["text"] = "New"
|
||||
self.new["command"] = self.new_map
|
||||
self.new.grid(row=0, column=0, padx=2)
|
||||
self.button_new = Button(self.button_frame)
|
||||
self.button_new["text"] = "New"
|
||||
self.button_new["command"] = self.new_map
|
||||
self.button_new.grid(row=0, column=0, padx=2)
|
||||
|
||||
self.open = Button(self.button_frame)
|
||||
self.open["text"] = "Open"
|
||||
|
|
@ -683,14 +684,6 @@ def macro_values(line, macro):
|
|||
values = values[1:]
|
||||
return values
|
||||
|
||||
def db_value(line):
|
||||
macro = 'db'
|
||||
return macro_values(line, macro)
|
||||
|
||||
def db_values(line):
|
||||
macro = 'db'
|
||||
return macro_values(line, macro)
|
||||
|
||||
def asm_at_label(asm, label):
|
||||
label_def = label + ':'
|
||||
lines = asm.split('\n')
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user