ref: 468d065715f0ff89dc59bae90aa857d1ea34ec59
parent: e8fdd637b600cfc886e37d0bff40fcba1430c720
author: Bryan Bishop <kanzure@gmail.com>
date: Mon Jan 9 21:11:54 EST 2012
call $3927 -> call AddPokemonToParty hg-commit-id: a4ec02195797
--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -712,4 +712,4 @@
#0x18f96 is PalletTownText1
#0x19B5D is BluesHouseText1
- print output_bank_opcodes(0x3e48)[0]
+ print output_bank_opcodes(0x3927)[0]
--- a/extras/insert_texts.py
+++ b/extras/insert_texts.py
@@ -424,7 +424,7 @@
#insert_08_asm(83, 1)
#insert_all_08s()
- insert_asm(0x3e48, "GivePokemon")
+ insert_asm(0x3927, "AddPokemonToParty")
print "-- FAILED ATTEMPTS --"
print str(failed_attempts)
--- a/pokered.asm
+++ b/pokered.asm
@@ -1359,8 +1359,22 @@
ld [$2000],a
ret
-INCBIN "baserom.gbc",$37DF,$3A87 - $37DF
+INCBIN "baserom.gbc",$37df,$3927 - $37df
+AddPokemonToParty: ; 0x3927
+ push hl
+ push de
+ push bc
+ ld b, $3
+ ld hl, $72e5
+ call $35d6
+ pop bc
+ pop de
+ pop hl
+ ret
+
+INCBIN "baserom.gbc",$3936,$3A87 - $3936
+
AddNTimes: ; 3A87
; add bc to hl a times
and a
@@ -4717,7 +4731,7 @@
xor a
ld [$cc49],a
call CleanLCD_OAM
- call $3927 ;add mon to Party
+ call AddPokemonToParty ;add mon to Party
jr .End\@
.sendToBox\@ ;$5907
call CleanLCD_OAM
@@ -10024,7 +10038,7 @@
ld a,1
ld [$CC49],a
push hl
- call $3927
+ call AddPokemonToParty
pop hl
jr .LoopTrainerData\@
.SpecialTrainer\@
@@ -10041,7 +10055,7 @@
ld a,1
ld [$CC49],a
push hl
- call $3927
+ call AddPokemonToParty
pop hl
jr .SpecialTrainer\@
.AddLoneAttack\@