give/takeitem *, 1: the 1 is optional

This commit is contained in:
PikalaxALT
2015-11-04 20:20:14 -05:00
parent 7fd20e6322
commit 3cadc7b012
108 changed files with 1722 additions and 1663 deletions

View File

@@ -15,7 +15,7 @@ FruitTreeScript:: ; 44000
.fruit
writetext HeyItsFruitText
copybytetovar CurFruit
giveitem ITEM_FROM_MEM, 1
giveitem ITEM_FROM_MEM
iffalse .packisfull
keeptextopen
writetext ObtainedFruitText

View File

@@ -1197,9 +1197,9 @@ ApplyPersonFacing: ; 0x9728b
add hl, bc
ld a, [hl]
push bc
call Function1836
call DoesSpriteHaveFacings
pop bc
jr c, .not_visible ; 0x9729c $1b
jr c, .not_visible ; STILL_SPRITE
ld hl, OBJECT_FLAGS1
add hl, bc
bit 2, [hl]

View File

@@ -178,7 +178,7 @@ SpecialsPointers:: ; c029
add_special Function1037eb
add_special Function10383c
add_special Mobile_HealParty
add_special Function14168
add_special RefreshSprites
add_special Function1037c2
add_special Function10630f
add_special Function103780

1480
engine/sprites.asm Executable file

File diff suppressed because it is too large Load Diff

View File

@@ -328,7 +328,7 @@ BugContestResultsScript:
farwritetext ContestResults_ConsolationPrizeText
keeptextopen
waitbutton
verbosegiveitem BERRY, 1
verbosegiveitem BERRY
iffalse BugContestResults_NoRoomForBerry
BugContestResults_DidNotWin
@@ -387,7 +387,7 @@ BugContestResults_FirstPlace ; 0xbc31e
itemtotext SUN_STONE, $1
farwritetext ContestResults_PlayerWonAPrizeText
closetext
verbosegiveitem SUN_STONE, 1
verbosegiveitem SUN_STONE
iffalse BugContestResults_NoRoomForSunStone
jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc332
@@ -396,7 +396,7 @@ BugContestResults_SecondPlace ; 0xbc332
itemtotext EVERSTONE, $1
farwritetext ContestResults_PlayerWonAPrizeText
closetext
verbosegiveitem EVERSTONE, 1
verbosegiveitem EVERSTONE
iffalse BugContestResults_NoRoomForEverstone
jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc343
@@ -405,7 +405,7 @@ BugContestResults_ThirdPlace ; 0xbc343
itemtotext GOLD_BERRY, $1
farwritetext ContestResults_PlayerWonAPrizeText
closetext
verbosegiveitem GOLD_BERRY, 1
verbosegiveitem GOLD_BERRY
iffalse BugContestResults_NoRoomForGoldBerry
jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc354