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 /event | |
| parent | 1fbe471b74908be6e89777857bf7407ef427225b (diff) | |
| parent | d6fbdfb8decf6231d6b43fbfcba63f9ce60308dc (diff) | |
Merge pull request #256 from yenatch/master
Fix predefs and battle code.
Diffstat (limited to 'event')
| -rw-r--r-- | event/dratini.asm | 4 | ||||
| -rw-r--r-- | event/name_rater.asm | 10 | ||||
| -rw-r--r-- | event/poke_seer.asm | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/event/dratini.asm b/event/dratini.asm index bf8ae2d57..1845673c8 100644 --- a/event/dratini.asm +++ b/event/dratini.asm @@ -51,8 +51,8 @@ SpecialDratini: ; 0x8b170 ; get the PP of the new move dec a - ld hl, Moves + PlayerMovePP - PlayerMoveStruct - ld bc, Move2 - Move1 + ld hl, Moves + MOVE_PP + ld bc, MOVE_LENGTH call AddNTimes ld a, BANK(Moves) call GetFarByte diff --git a/event/name_rater.asm b/event/name_rater.asm index 3f2bf3912..d22ece2b5 100644 --- a/event/name_rater.asm +++ b/event/name_rater.asm @@ -34,7 +34,7 @@ NameRater: ; fb6ed call Functionfb7d3 ld hl, UnknownText_0xfb837 jr c, .asm_fb76c - ld hl, PartyMon1Nickname + ld hl, PartyMonNicknames ld bc, $000b ld a, [CurPartyMon] call AddNTimes @@ -70,12 +70,12 @@ NameRater: ; fb6ed ; fb78a Functionfb78a: ; fb78a - ld hl, PartyMon1OT - ld bc, $000b + ld hl, PartyMonOT + ld bc, NAME_LENGTH ld a, [CurPartyMon] call AddNTimes ld de, PlayerName - ld c, $b + ld c, NAME_LENGTH call .asm_fb7b1 jr c, .asm_fb7bc ld hl, PartyMon1ID @@ -122,7 +122,7 @@ Functionfb7be: ; fb7be ; fb7d3 Functionfb7d3: ; fb7d3 - ld hl, PartyMon1Nickname + ld hl, PartyMonNicknames ld bc, $000b ld a, [CurPartyMon] call AddNTimes diff --git a/event/poke_seer.asm b/event/poke_seer.asm index f49e8ce07..13b2ddbeb 100644 --- a/event/poke_seer.asm +++ b/event/poke_seer.asm @@ -139,7 +139,7 @@ ReadCaughtData: ; 4f134 GetCaughtName: ; 4f176 ld a, [CurPartyMon] - ld hl, PartyMon1Nickname + ld hl, PartyMonNicknames ld bc, PKMN_NAME_LENGTH call AddNTimes ld de, $d003 @@ -258,8 +258,8 @@ GetCaughtLocation: ; 4f20a GetCaughtOT: ; 4f242 ld a, [CurPartyMon] - ld hl, PartyMon1OT - ld bc, $000b + ld hl, PartyMonOT + ld bc, NAME_LENGTH call AddNTimes ld de, $d02a ld bc, $000b |