Move code out of data/

This commit is contained in:
Remy Oukaour 2018-01-12 03:15:58 -05:00
parent bdc95598d7
commit 0e1148fb2c
3 changed files with 32 additions and 33 deletions

View File

@ -1,36 +1,3 @@
PrintItemDescription: ; 0x1c8955
; Print the description for item [CurSpecies] at de.
ld a, [CurSpecies]
cp TM01
jr c, .not_a_tm
ld [CurItem], a
push de
farcall GetTMHMItemMove
pop hl
ld a, [wd265]
ld [CurSpecies], a
predef PrintMoveDesc
ret
.not_a_tm
push de
ld hl, ItemDescriptions
ld a, [CurSpecies]
dec a
ld c, a
ld b, 0
add hl, bc
add hl, bc
ld e, [hl]
inc hl
ld d, [hl]
pop hl
jp PlaceString
; 0x1c8987
ItemDescriptions:
dw MasterBallDesc
dw UltraBallDesc

View File

@ -0,0 +1,31 @@
PrintItemDescription: ; 0x1c8955
; Print the description for item [CurSpecies] at de.
ld a, [CurSpecies]
cp TM01
jr c, .not_a_tm
ld [CurItem], a
push de
farcall GetTMHMItemMove
pop hl
ld a, [wd265]
ld [CurSpecies], a
predef PrintMoveDesc
ret
.not_a_tm
push de
ld hl, ItemDescriptions
ld a, [CurSpecies]
dec a
ld c, a
ld b, 0
add hl, bc
add hl, bc
ld e, [hl]
inc hl
ld d, [hl]
pop hl
jp PlaceString
; 0x1c8987

View File

@ -596,6 +596,7 @@ INCLUDE "data/phone/text/trainers1.asm"
SECTION "Miscellaneous Text", ROMX
INCLUDE "data/items/names.asm"
INCLUDE "engine/routines/printitemdescription.asm"
INCLUDE "data/items/descriptions.asm"
INCLUDE "data/moves/names.asm"
INCLUDE "engine/landmarks.asm"