summaryrefslogtreecommitdiff
path: root/engine/events/misc_scripts.asm
diff options
context:
space:
mode:
authorlibjet <libj3t@gmail.com>2019-12-09 22:20:03 +0000
committerlibjet <libj3t@gmail.com>2019-12-09 22:20:03 +0000
commitcc8fc02a9467307f1494946fd08b4e57d4ffdac5 (patch)
treefa37c8c82262b5a0d5db6d76d7edf9d78bbf25da /engine/events/misc_scripts.asm
parentcfe6e295746996e64198b2a4b0f0eba1420ca8eb (diff)
Added engine/events stuff and cleaned up contest related code
Diffstat (limited to 'engine/events/misc_scripts.asm')
-rwxr-xr-xengine/events/misc_scripts.asm44
1 files changed, 21 insertions, 23 deletions
diff --git a/engine/events/misc_scripts.asm b/engine/events/misc_scripts.asm
index 6ac81da9..0a742812 100755
--- a/engine/events/misc_scripts.asm
+++ b/engine/events/misc_scripts.asm
@@ -11,7 +11,7 @@ FindItemInBallScript::
iffalse .no_room
disappear LAST_TALKED
opentext
- writetext .text_found
+ writetext .FoundItemText
playsound SFX_ITEM
pause 60
itemnotify
@@ -20,38 +20,36 @@ FindItemInBallScript::
.no_room
opentext
- writetext .text_found
+ writetext .FoundItemText
waitbutton
- writetext .text_bag_full
+ writetext .CantCarryItemText
waitbutton
closetext
end
-.text_found
- ; found @ !
- text_jump UnknownText_0x1c0a1c
+.FoundItemText:
+ text_jump _FoundItemText
db "@"
-.text_bag_full
- ; But can't carry any more items.
- text_jump UnknownText_0x1c0a2c
+.CantCarryItemText:
+ text_jump _CantCarryItemText
db "@"
.TryReceiveItem:
- xor a
- ld [wScriptVar], a
- ld a, [wcf29]
- ld [wDeciramBuffer], a
- call GetItemName
- ld hl, wStringBuffer3
- call CopyName2
- ld a, [wcf29]
- ld [wd002], a
- ld a, [wcf2a]
- ld [wItemQuantityChangeBuffer], a
- ld hl, wNumItems
- call ReceiveItem
- ret nc
+ xor a
+ ld [wScriptVar], a
+ ld a, [wcf29]
+ ld [wDeciramBuffer], a
+ call GetItemName
+ ld hl, wStringBuffer3
+ call CopyName2
+ ld a, [wcf29]
+ ld [wd002], a
+ ld a, [wcf2a]
+ ld [wItemQuantityChangeBuffer], a
+ ld hl, wNumItems
+ call ReceiveItem
+ ret nc
ld a, $1
ld [wScriptVar], a
ret \ No newline at end of file