pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

give/takeitem *, 1: the 1 is optional

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
constants/gfx_constants.asm
View File

@ -39,4 +39,8 @@ const_value SET 1
const ANIM_GFX_WAVE const ANIM_GFX_WAVE
const ANIM_GFX_AEROBLAST const ANIM_GFX_AEROBLAST
LEN_2BPP_TILE EQU 16
LEN_1BPP_TILE EQU 8
TILES_PER_FRAME EQU 6
TILESIZE EQU $10 TILESIZE EQU $10

5
constants/map_constants.asm
View File

@ -587,7 +587,10 @@ OW_RIGHT EQU RIGHT << 2
const EMOTE_BOLT ; 5 const EMOTE_BOLT ; 5
const EMOTE_SLEEP ; 6 const EMOTE_SLEEP ; 6
const EMOTE_FISH ; 7 const EMOTE_FISH ; 7
const EMOTE_ROD ; 8 - add directional constant const EMOTE_08 ; 8
const EMOTE_09 ; 9
const EMOTE_0A ; 10
const EMOTE_0B ; 11
EMOTE_MEM EQU -1 EMOTE_MEM EQU -1
const_def const_def

4
constants/misc_constants.asm
View File

@ -164,7 +164,3 @@ HMENURETURN_SCRIPT EQU %10000000
HMENURETURN_ASM EQU %11111111 HMENURETURN_ASM EQU %11111111
NUM_MON_SUBMENU_ITEMS EQU 8 NUM_MON_SUBMENU_ITEMS EQU 8
LEN_2BPP_TILE EQU 16
LEN_1BPP_TILE EQU 8
TILES_PER_FRAME EQU 6

12
constants/sprite_constants.asm
View File

@ -170,6 +170,16 @@ const_value SET 1
const STANDING_SPRITE const STANDING_SPRITE
const STILL_SPRITE const STILL_SPRITE
; sprite header fields
const_def
const SPRITEHEADER_ADDR_LO
const SPRITEHEADER_ADDR_HI
const SPRITEHEADER_SIZE
const SPRITEHEADER_BANK
const SPRITEHEADER_TYPE
const SPRITEHEADER_PALETTE
NUM_SPRITEHEADER_FIELDS EQU const_value
; sprite palettes ; sprite palettes
const_def const_def
const PAL_OW_RED const PAL_OW_RED
@ -252,3 +262,5 @@ const_value SET 1
const SPRITEMOVEFN_19 const SPRITEMOVEFN_19
const SPRITEMOVEFN_1A const SPRITEMOVEFN_1A
const SPRITEMOVEFN_1B const SPRITEMOVEFN_1B
MAX_OUTDOOR_SPRITES EQU 23

2
engine/fruit_trees.asm
View File

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

4
engine/scripting.asm
View File

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

2
engine/specials.asm
View File

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

1480
engine/sprites.asm Executable file
View File

File diff suppressed because it is too large Load Diff

8
engine/std_scripts.asm
View File

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

1
gfx/overworld/sprite_headers.asm
View File

@ -4,6 +4,7 @@
; Type, Palette ; Type, Palette
sprite_header: MACRO sprite_header: MACRO
; pointer, length, type, palette
dw \1 dw \1
db \2 * 4 tiles, BANK(\1) db \2 * 4 tiles, BANK(\1)
db \3, \4 db \3, \4

2
home/map.asm
View File

@ -2021,7 +2021,7 @@ Function2b74:: ; 0x2b74
Function2bae:: ; 2bae Function2bae:: ; 2bae
call DisableLCD call DisableLCD
call ClearSprites call ClearSprites
callba Function14168 callba RefreshSprites
call LoadStandardFont call LoadStandardFont
call LoadFontsExtra call LoadFontsExtra
ld a, [hROMBank] ld a, [hROMBank]

6
home/map_objects.asm
View File

@ -52,18 +52,18 @@ endr
ret ret
; 1836 ; 1836
Function1836:: ; 1836 DoesSpriteHaveFacings:: ; 1836
push de push de
push hl push hl
ld b, a ld b, a
ld a, [hROMBank] ld a, [hROMBank]
push af push af
ld a, BANK(Function142a7) ld a, BANK(_DoesSpriteHaveFacings)
rst Bankswitch rst Bankswitch
ld a, b ld a, b
call Function142a7 call _DoesSpriteHaveFacings
ld c, a ld c, a
pop de pop de

12
macros/event.asm
View File

@ -206,14 +206,22 @@ writecode: macro
giveitem: macro giveitem: macro
db giveitem_command db giveitem_command
db \1 ; item db \1 ; item
if _NARG == 2
db \2 ; quantity db \2 ; quantity
else
db 1
endc
endm endm
enum takeitem_command enum takeitem_command
takeitem: macro takeitem: macro
db takeitem_command db takeitem_command
db \1 ; item db \1 ; item
if _NARG == 2
db \2 ; quantity db \2 ; quantity
else
db 1
endc
endm endm
enum checkitem_command enum checkitem_command
@ -986,7 +994,11 @@ checkphonecall: macro
verbosegiveitem: macro verbosegiveitem: macro
db verbosegiveitem_command db verbosegiveitem_command
db \1 ; item db \1 ; item
if _NARG == 2
db \2 ; quantity db \2 ; quantity
else
db 1
endc
endm endm
enum verbosegiveitem2_command enum verbosegiveitem2_command

1491
main.asm
View File

File diff suppressed because it is too large Load Diff

2
maps/AzaleaGym.asm
View File

@ -34,7 +34,7 @@ BugsyScript:
setevent EVENT_BEAT_BUG_CATCHER_JOSH setevent EVENT_BEAT_BUG_CATCHER_JOSH
writetext BugsyText_HiveBadgeSpeech writetext BugsyText_HiveBadgeSpeech
keeptextopen keeptextopen
verbosegiveitem TM_FURY_CUTTER, 1 verbosegiveitem TM_FURY_CUTTER
iffalse .NoRoomForFuryCutter iffalse .NoRoomForFuryCutter
setevent EVENT_GOT_TM49_FURY_CUTTER setevent EVENT_GOT_TM49_FURY_CUTTER
writetext BugsyText_FuryCutterSpeech writetext BugsyText_FuryCutterSpeech

2
maps/AzaleaTown.asm
View File

@ -155,7 +155,7 @@ UnknownScript_0x1980e5:
keeptextopen keeptextopen
writetext UnknownText_0x198628 writetext UnknownText_0x198628
closetext closetext
verbosegiveitem GS_BALL, 1 verbosegiveitem GS_BALL
spriteface $d, LEFT spriteface $d, LEFT
setflag ENGINE_HAVE_EXAMINED_GS_BALL setflag ENGINE_HAVE_EXAMINED_GS_BALL
clearevent EVENT_ILEX_FOREST_LASS clearevent EVENT_ILEX_FOREST_LASS

10
maps/BillsHouse.asm
View File

@ -117,7 +117,7 @@ UnknownScript_0x18963b:
checkevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA checkevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x189592 iftrue UnknownScript_0x189592
scall UnknownScript_0x1896b5 scall UnknownScript_0x1896b5
verbosegiveitem EVERSTONE, 1 verbosegiveitem EVERSTONE
iffalse UnknownScript_0x1896cc iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS setevent EVENT_GAVE_KURT_APRICORNS
@ -128,7 +128,7 @@ UnknownScript_0x189652:
checkevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA checkevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x1895b3 iftrue UnknownScript_0x1895b3
scall UnknownScript_0x1896b5 scall UnknownScript_0x1896b5
verbosegiveitem LEAF_STONE, 1 verbosegiveitem LEAF_STONE
iffalse UnknownScript_0x1896cc iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS setevent EVENT_GAVE_KURT_APRICORNS
@ -139,7 +139,7 @@ UnknownScript_0x189669:
checkevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA checkevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x1895d4 iftrue UnknownScript_0x1895d4
scall UnknownScript_0x1896b5 scall UnknownScript_0x1896b5
verbosegiveitem WATER_STONE, 1 verbosegiveitem WATER_STONE
iffalse UnknownScript_0x1896cc iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS setevent EVENT_GAVE_KURT_APRICORNS
@ -150,7 +150,7 @@ UnknownScript_0x189680:
checkevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA checkevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x18961a iftrue UnknownScript_0x18961a
scall UnknownScript_0x1896b5 scall UnknownScript_0x1896b5
verbosegiveitem FIRE_STONE, 1 verbosegiveitem FIRE_STONE
iffalse UnknownScript_0x1896cc iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS setevent EVENT_GAVE_KURT_APRICORNS
@ -159,7 +159,7 @@ UnknownScript_0x189680:
UnknownScript_0x189697: UnknownScript_0x189697:
scall UnknownScript_0x1896b5 scall UnknownScript_0x1896b5
verbosegiveitem THUNDERSTONE, 1 verbosegiveitem THUNDERSTONE
iffalse UnknownScript_0x1896cc iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA setevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
loadmovesprites loadmovesprites

2
maps/BlackthornCity.asm
View File

@ -93,7 +93,7 @@ SantosScript:
.MetSantos .MetSantos
writetext SantosGivesGiftText writetext SantosGivesGiftText
keeptextopen keeptextopen
verbosegiveitem SPELL_TAG, 1 verbosegiveitem SPELL_TAG
iffalse SantosDoneScript iffalse SantosDoneScript
setevent EVENT_GOT_SPELL_TAG_FROM_SANTOS setevent EVENT_GOT_SPELL_TAG_FROM_SANTOS
writetext SantosGaveGiftText writetext SantosGaveGiftText

2
maps/BlackthornGym1F.asm
View File

@ -62,7 +62,7 @@ UnknownScript_0x194e69:
iftrue UnknownScript_0x194e94 iftrue UnknownScript_0x194e94
writetext UnknownText_0x195196 writetext UnknownText_0x195196
keeptextopen keeptextopen
giveitem TM_DRAGONBREATH, 1 giveitem TM_DRAGONBREATH
iffalse UnknownScript_0x194e8e iffalse UnknownScript_0x194e8e
itemtotext TM_DRAGONBREATH, $0 itemtotext TM_DRAGONBREATH, $0
writetext UnknownText_0x1951bf writetext UnknownText_0x1951bf

2
maps/CeladonCafe.asm
View File

@ -86,7 +86,7 @@ EatathonContestPoster:
CeladonCafeTrashcan: CeladonCafeTrashcan:
checkevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE checkevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE
iftrue .TrashEmpty iftrue .TrashEmpty
giveitem LEFTOVERS, 1 giveitem LEFTOVERS
iffalse .PackFull iffalse .PackFull
loadfont loadfont
itemtotext LEFTOVERS, $0 itemtotext LEFTOVERS, $0

Some files were not shown because too many files have changed in this diff Show More