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

more item effects

Browse Source
This commit is contained in:
yenatch 2013-08-03 16:19:29 -04:00
parent 46fea97994
commit 0ee006a145
3 changed files with 718 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
items/item_effects.asm
View File

@ -754,6 +754,7 @@ Function_0xed12: ; ed12
ld a, [TempBattleMonSpecies] ld a, [TempBattleMonSpecies]
cp c cp c
ret nz ret nz
push bc push bc
ld a, [TempBattleMonSpecies] ld a, [TempBattleMonSpecies]
ld [CurPartySpecies], a ld [CurPartySpecies], a
@ -764,14 +765,13 @@ Function_0xed12: ; ed12
ld a, $14 ld a, $14
ld hl, $4bdd ld hl, $4bdd
rst FarCall rst FarCall
jr c, .asm_ed66 jr c, .asm_ed66
ld d, $0 ld d, 0
jr nz, .asm_ed39 jr nz, .asm_ed39
inc d inc d
.asm_ed39 .asm_ed39
push de push de
ld a, [TempEnemyMonSpecies] ld a, [TempEnemyMonSpecies]
ld [CurPartySpecies], a ld [CurPartySpecies], a
@ -780,28 +780,25 @@ Function_0xed12: ; ed12
ld a, $14 ld a, $14
ld hl, $4bdd ld hl, $4bdd
rst FarCall rst FarCall
jr c, .asm_ed65 jr c, .asm_ed65
ld d, $0 ld d, 0
jr nz, .asm_ed52 jr nz, .asm_ed52
inc d inc d
.asm_ed52 .asm_ed52
ld a, d ld a, d
pop de pop de
cp d cp d
pop bc pop bc
ret nz ret nz
sla b
jr c, .asm_ed62
sla b sla b
jr c, .asm_ed62 jr c, .asm_ed62
sla b
jr c, .asm_ed62
sla b sla b
ret nc ret nc
.asm_ed62 .asm_ed62
ld b, $ff ld b, $ff
ret ret
@ -1657,34 +1654,25 @@ INCBIN "baserom.gbc", $f652, $f73e - $f652
Squirtbottle: ; f73e Squirtbottle: ; f73e
ld a, $14 callba _Squirtbottle
ld hl, $4730
rst FarCall
ret ret
; f745 ; f745
CardKey: ; f745 CardKey: ; f745
ld a, $14 callba _CardKey
ld hl, $4779
rst FarCall
ret ret
; f74c ; f74c
BasementKey: ; f74c BasementKey: ; f74c
ld a, $14 callba _BasementKey
ld hl, $47b4
rst FarCall
ret ret
; f753 ; f753
SacredAsh: ; f753 SacredAsh: ; f753
ld a, $14 callba _SacredAsh
ld hl, $47e6
rst FarCall
ld a, [$d0ec] ld a, [$d0ec]
cp $1 cp $1
ret nz ret nz

766
main.asm
View File

File diff suppressed because it is too large Load Diff

4
maps/Route36.asm
View File

@ -64,6 +64,10 @@ UnknownScript_0x19404a: ; 0x19404a
yesorno yesorno
iffalse UnknownScript_0x194079 iffalse UnknownScript_0x194079
loadmovesprites loadmovesprites
; fallthrough
; 0x194053
WateredWeirdTreeScript: ; 0x194053
loadfont loadfont
2writetext UnknownText_0x194290 2writetext UnknownText_0x194290
closetext closetext