summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-11-10 14:18:54 -0600
committerBryan Bishop <kanzure@gmail.com>2013-11-10 14:18:54 -0600
commit699ed8c6c1fa58a7d3b3edf58542541e2e6f34af (patch)
tree80f8c6f187b20f3ed1bf73c80886714bc6999c28
parentb36e42494df301452594534a87bdebc2296d4cc0 (diff)
fix a few call() calls
-rw-r--r--pokemontools/vba/vba.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/pokemontools/vba/vba.py b/pokemontools/vba/vba.py
index b3224bb..c32e8bd 100644
--- a/pokemontools/vba/vba.py
+++ b/pokemontools/vba/vba.py
@@ -647,7 +647,7 @@ class crystal(object):
memory[0xd231] = trainer_id
self.vba.memory = memory
- self.call(Script_startbattle_address)
+ self.call(calculate_address(Script_startbattle_address), bank=calculate_bank(Script_startbattle_address,))
def set_script(self, address):
"""
@@ -678,7 +678,7 @@ class crystal(object):
self.set_script(givepoke_data_address)
- self.call(givepoke_address)
+ self.call(calculate_address(givepoke_address), bank=calculate_bank(givepoke_address))
def broken_start_random_battle_by_rocksmash_battle_script(self):
"""
@@ -699,11 +699,11 @@ class crystal(object):
self.vba.registers["af"] = (calculate_bank(RockSmashBattleScript_address) << 8) | (self.vba.registers.af & 0xff)
self.vba.registers["hl"] = calculate_address(RockSmashBattleScript_address)
- self.call(CallScript_address)
+ self.call(calculate_address(CallScript_address), bank=calculate_bank(CallScript_address))
#def attempt_start_battle_by_startbattle(self):
# StartBattle_address = 0x3f4c1
- # self.call(StartBattle_address)
+ # self.call(calculate_address(StartBattle_address), bank=calculate_bank(StartBattle_address))
#def attempt_start_random_battle_by_wild_battle(self):
# start_wild_battle = 0x3f4dd