diff options
author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
---|---|---|
committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
commit | cb414f1480e9117e5d6ee0ab5cb81903e83cde9a (patch) | |
tree | e44bd6299c61335a9a0476db57b565aadcd0b4d7 /engine/overworld/item.asm | |
parent | 2ea331ebb341505df1cd8429b140c52e345a5af4 (diff) |
overworld item & movement code, cable club code, remove more instances of W_, add PIKAHAPPY_TRADE
Also make replace.sh take args
Diffstat (limited to 'engine/overworld/item.asm')
-rw-r--r-- | engine/overworld/item.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/overworld/item.asm b/engine/overworld/item.asm index 6fbe823d..f4f46535 100644 --- a/engine/overworld/item.asm +++ b/engine/overworld/item.asm @@ -1,9 +1,9 @@ -PickUpItem: +PickUpItem: ; 4d55 (1:4d55) call EnableAutoTextBoxDrawing ld a, [hSpriteIndexOrTextID] ld b, a - ld hl, W_MISSABLEOBJECTLIST + ld hl, wMissableObjectList .missableObjectsListLoop ld a, [hli] cp $ff @@ -17,7 +17,7 @@ PickUpItem: ld a, [hl] ld [$ffdb], a - ld hl, W_MAPSPRITEEXTRADATA + ld hl, wMapSpriteExtraData ld a, [hSpriteIndexOrTextID] dec a add a @@ -44,11 +44,11 @@ PickUpItem: call PrintText ret -FoundItemText: +FoundItemText: ; 4d9a (1:4d9a) TX_FAR _FoundItemText db $0B db "@" -NoMoreRoomForItemText: +NoMoreRoomForItemText: ; 4da0 (1:4da0) TX_FAR _NoMoreRoomForItemText - db "@" + db "@"
\ No newline at end of file |