diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-15 15:08:26 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-15 15:08:26 -0500 |
| commit | 5812b213fd2d3dd967ad09007f384bbd176b0786 (patch) | |
| tree | a49957f470e87cd755535e4479e99b975d50e112 | |
| parent | c69fadf00ae8082df102005f834fc8d395870826 (diff) | |
engine/items/tms.asm
| -rwxr-xr-x | data/tms.asm | 1 | ||||
| -rwxr-xr-x | engine/items/tms.asm | 12 | ||||
| -rwxr-xr-x | yellow/main.asm | 3 |
3 files changed, 11 insertions, 5 deletions
diff --git a/data/tms.asm b/data/tms.asm index 23630691..e41a60e9 100755 --- a/data/tms.asm +++ b/data/tms.asm @@ -54,3 +54,4 @@ TechnicalMachines: ; 13773 (4:7773) db SURF db STRENGTH db FLASH + db $ff ; terminator diff --git a/engine/items/tms.asm b/engine/items/tms.asm index 7d00f7f3..9621e550 100755 --- a/engine/items/tms.asm +++ b/engine/items/tms.asm @@ -1,5 +1,5 @@ ; tests if mon [wcf91] can learn move [wMoveNum] -CanLearnTM: ; 1373e (4:773e) +CanLearnTM: ; 122f0 (4:62f0) ld a, [wcf91] ld [wd0b5], a call GetMonHeader @@ -11,6 +11,8 @@ CanLearnTM: ; 1373e (4:773e) ld hl, TechnicalMachines .findTMloop ld a, [hli] + cp $ff ; reached terminator? + jr z, .done cp b jr z, .TMfoundLoop inc c @@ -19,10 +21,14 @@ CanLearnTM: ; 1373e (4:773e) pop hl ld b, FLAG_TEST predef_jump FlagActionPredef - +.done + pop hl + ld c, 0 + ret + ; converts TM/HM number in wd11e into move number ; HMs start at 51 -TMToMove: ; 13763 (4:7763) +TMToMove: ; 1231d (4:631d) ld a, [wd11e] dec a ld hl, TechnicalMachines diff --git a/yellow/main.asm b/yellow/main.asm index 0243415d..c9c64f10 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -3534,8 +3534,7 @@ ShrinkPic1: INCBIN "pic/trainer/shrink1.pic" ShrinkPic2: INCBIN "pic/trainer/shrink2.pic" INCLUDE "engine/menu/start_sub_menus.asm" - - dr $122f0,$12365 +INCLUDE "engine/items/tms.asm" SECTION "NPC Sprites 1", ROMX, BANK[NPC_SPRITES_1] |