diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2014-06-27 21:33:08 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2014-06-27 21:33:08 -0500 |
| commit | 1ecfe6bd23bb9b4e1886342c082bd5c3a108abbb (patch) | |
| tree | 8190d5b11ebec4505c5494baf74b339ae9c82078 /predef | |
| parent | 1fbe471b74908be6e89777857bf7407ef427225b (diff) | |
| parent | d6fbdfb8decf6231d6b43fbfcba63f9ce60308dc (diff) | |
Merge pull request #256 from yenatch/master
Fix predefs and battle code.
Diffstat (limited to 'predef')
| -rw-r--r-- | predef/cgb.asm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/predef/cgb.asm b/predef/cgb.asm index 8d59b2326..cee9c139e 100644 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -611,7 +611,7 @@ Function91e4: ; 91e4 .asm_91f5 ld hl, PartyMon1DVs - ld bc, $0030 + ld bc, PartyMon2 - PartyMon1 ld a, [CurPartyMon] call AddNTimes ld c, l @@ -840,11 +840,13 @@ Function93ba: ; 93ba Function93d3: ; 93d3 ld a, [BattleType] - cp $3 + cp BATTLETYPE_TUTORIAL jr z, .asm_93e6 + ld a, [PlayerGender] bit 0, a jr z, .asm_93e6 + ld hl, Palettes_9469 jr .asm_93e9 |