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

items/item_effects.asm; engine/evolution.asm

Browse Source
This commit is contained in:
PikalaxALT
2015-11-18 18:35:44 -05:00
parent 1ff37608b6
commit 91f7491017
18 changed files with 1096 additions and 1100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/breeding/egg.asm
View File

@@ -219,7 +219,7 @@ Function16f7a: ; 16f7a (5:6f7a)
push de
callba Function4dbb8
callba SetEggMonCaughtData
callba MobileFn_10608d
ld a, [CurPartyMon]
ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species)

682
engine/evolve.asm Executable file
View File

File diff suppressed because it is too large Load Diff

2
engine/link.asm
View File

@@ -1920,7 +1920,7 @@ Function28b87: ; 28b87
ld a, [PartyCount]
dec a
ld [CurPartyMon], a
callab Function421d8
callab EvolvePokemon
call ClearScreen
call Function28ef8
call Function28eff

52
engine/party_menu.asm
View File

@@ -839,92 +839,92 @@ YouHaveNoPKMNString: ; 0x50556
db "You have no <PK><MN>!@"
Function50566: ; 50566
PrintPartyMenuActionText: ; 50566
ld a, [CurPartyMon]
ld hl, PartyMonNicknames
call GetNick
ld a, [PartyMenuActionText]
and $f
ld hl, Unknown_5057b
call Function505c1
ld hl, .MenuActionTexts
call .PrintText
ret
; 5057b
Unknown_5057b: ; 5057b
dw UnknownText_0x50594
dw UnknownText_0x5059e
dw UnknownText_0x505a3
dw UnknownText_0x505a8
dw UnknownText_0x50599
dw UnknownText_0x5058f
dw UnknownText_0x505ad
dw UnknownText_0x505b2
dw UnknownText_0x505b7
dw UnknownText_0x505bc
.MenuActionTexts: ; 5057b
dw .Text_CuredOfPoison
dw .Text_BurnWasHealed
dw .Text_Defrosted
dw .Text_WokeUp
dw .Text_RidOfParalysis
dw .Text_RecoveredSomeHP
dw .Text_HealthReturned
dw .Text_Revitalized
dw .Text_GrewToLevel
dw .Text_CameToItsSenses
; 5058f
UnknownText_0x5058f: ; 0x5058f
.Text_RecoveredSomeHP: ; 0x5058f
; recovered @ HP!
text_jump UnknownText_0x1bc0a2
db "@"
; 0x50594
UnknownText_0x50594: ; 0x50594
.Text_CuredOfPoison: ; 0x50594
; 's cured of poison.
text_jump UnknownText_0x1bc0bb
db "@"
; 0x50599
UnknownText_0x50599: ; 0x50599
.Text_RidOfParalysis: ; 0x50599
; 's rid of paralysis.
text_jump UnknownText_0x1bc0d2
db "@"
; 0x5059e
UnknownText_0x5059e: ; 0x5059e
.Text_BurnWasHealed: ; 0x5059e
; 's burn was healed.
text_jump UnknownText_0x1bc0ea
db "@"
; 0x505a3
UnknownText_0x505a3: ; 0x505a3
.Text_Defrosted: ; 0x505a3
; was defrosted.
text_jump UnknownText_0x1bc101
db "@"
; 0x505a8
UnknownText_0x505a8: ; 0x505a8
.Text_WokeUp: ; 0x505a8
; woke up.
text_jump UnknownText_0x1bc115
db "@"
; 0x505ad
UnknownText_0x505ad: ; 0x505ad
.Text_HealthReturned: ; 0x505ad
; 's health returned.
text_jump UnknownText_0x1bc123
db "@"
; 0x505b2
UnknownText_0x505b2: ; 0x505b2
.Text_Revitalized: ; 0x505b2
; is revitalized.
text_jump UnknownText_0x1bc13a
db "@"
; 0x505b7
UnknownText_0x505b7: ; 0x505b7
.Text_GrewToLevel: ; 0x505b7
; grew to level @ !@ @
text_jump UnknownText_0x1bc14f
db "@"
; 0x505bc
UnknownText_0x505bc: ; 0x505bc
.Text_CameToItsSenses: ; 0x505bc
; came to its senses.
text_jump UnknownText_0x1bc16e
db "@"
; 0x505c1
Function505c1: ; 505c1
.PrintText: ; 505c1
ld e, a
ld d, 0
rept 2
@@ -935,7 +935,7 @@ endr
ld l, a
ld a, [Options]
push af
set 4, a
set NO_TEXT_SCROLL, a
ld [Options], a
call PrintText
pop af

5
engine/pokegear.asm
View File

@@ -330,7 +330,7 @@ Function90e3f: ; 90e3f
.kanto
ld e, 1
.ok
callba Function91ae1
callba PokegearMap
ld a, $7
ld bc, $12
hlcoord 1, 2
@@ -1919,7 +1919,8 @@ endr
.kanto
jp LoadStation_PlacesAndPeople
; 91ae1
Function91ae1: ; 91ae1
PokegearMap: ; 91ae1
ld a, e
and a
jr nz, .kanto

4
engine/predef.asm
View File

@@ -58,7 +58,7 @@ PredefPointers:: ; 856b
add_predef GetMonFrontpic
add_predef LearnLevelMoves
add_predef FillMoves
add_predef Function421e6
add_predef EvolveAfterBattle
add_predef Function28f63
add_predef Function28f24
add_predef CopyPkmnToTempMon
@@ -97,7 +97,7 @@ PredefPointers:: ; 856b
add_predef DecompressPredef ; $40
add_predef CheckTypeMatchup
add_predef ConvertMon_1to2
add_predef Functionfb877
add_predef NewPokedexEntry
add_predef AnimateMon_Slow_Normal
add_predef PlaceStatusString
add_predef LoadMonAnimation

2
engine/specials.asm
View File

@@ -215,7 +215,7 @@ Special_GameCornerPrizeMonCheckDex: ; c230
call FadeToMenu
ld a, [ScriptVar]
ld [wd265], a
callba Functionfb877
callba NewPokedexEntry
call ExitAllMenus
ret
; c252

97
engine/startmenu.asm
View File

@@ -664,7 +664,7 @@ UnknownText_0x12a5b: ; 0x12a5b
CantUseItem: ; 12a60
ld hl, CantUseItemText
call Function2012
call MenuTextBoxWaitButton
ret
; 12a67
@@ -1241,14 +1241,14 @@ OpenPartyStats: ; 12e00
MonMenu_Cut: ; 12e1b
callba CutFunction
ld a, [wd0ec]
ld a, [wFieldMoveSucceeded]
cp $1
jr nz, .asm_12e2d
jr nz, .Fail
ld b, $4
ld a, $2
ret
.asm_12e2d
.Fail
ld a, $3
ret
; 12e30
@@ -1256,160 +1256,161 @@ MonMenu_Cut: ; 12e1b
MonMenu_Fly: ; 12e30
callba FlyFunction
ld a, [wd0ec]
ld a, [wFieldMoveSucceeded]
cp $2
jr z, .asm_12e4c
jr z, .Fail
cp $0
jr z, .asm_12e4f
jr z, .Error
callba MobileFn_1060b5
ld b, $4
ld a, $2
ret
.asm_12e4c
.Fail
ld a, $3
ret
.asm_12e4f
.Error
ld a, $0
ret
.asm_12e52
.Unused
ld a, $1
ret
; 12e55
MonMenu_Flash: ; 12e55
callba Functionc8ac
ld a, [wd0ec]
ld a, [wFieldMoveSucceeded]
cp $1
jr nz, .asm_12e67
jr nz, .Fail
ld b, $4
ld a, $2
ret
.asm_12e67
.Fail
ld a, $3
ret
; 12e6a
MonMenu_Strength: ; 12e6a
callba StrengthFunction
ld a, [wd0ec]
ld a, [wFieldMoveSucceeded]
cp $1
jr nz, .asm_12e7c
jr nz, .Fail
ld b, $4
ld a, $2
ret
.asm_12e7c
.Fail
ld a, $3
ret
; 12e7f
MonMenu_Whirlpool: ; 12e7f
callba WhirlpoolFunction
ld a, [wd0ec]
ld a, [wFieldMoveSucceeded]
cp $1
jr nz, .asm_12e91
jr nz, .Fail
ld b, $4
ld a, $2
ret
.asm_12e91
.Fail
ld a, $3
ret
; 12e94
MonMenu_Waterfall: ; 12e94
callba Functioncade
ld a, [wd0ec]
ld a, [wFieldMoveSucceeded]
cp $1
jr nz, .asm_12ea6
jr nz, .Fail
ld b, $4
ld a, $2
ret
.asm_12ea6
.Fail
ld a, $3
ret
; 12ea9
MonMenu_Teleport: ; 12ea9
callba TeleportFunction
ld a, [wd0ec]
ld a, [wFieldMoveSucceeded]
and a
jr z, .asm_12eba
jr z, .Fail
ld b, $4
ld a, $2
ret
.asm_12eba
.Fail
ld a, $3
ret
; 12ebd
MonMenu_Surf: ; 12ebd
callba SurfFunction
ld a, [wd0ec]
ld a, [wFieldMoveSucceeded]
and a
jr z, .asm_12ece
jr z, .Fail
ld b, $4
ld a, $2
ret
.asm_12ece
.Fail
ld a, $3
ret
; 12ed1
MonMenu_Dig: ; 12ed1
callba DigFunction
ld a, [wd0ec]
ld a, [wFieldMoveSucceeded]
cp $1
jr nz, .asm_12ee3
jr nz, .Fail
ld b, $4
ld a, $2
ret
.asm_12ee3
.Fail
ld a, $3
ret
; 12ee6
MonMenu_Softboiled_MilkDrink: ; 12ee6
call Function12f05
jr nc, .asm_12ef3
callba Functionf3df
jr .asm_12ef9
call .CheckMonHasEnoughHP
jr nc, .NotEnoughHP
callba Softboiled_MilkDrinkFunction
jr .finish
.asm_12ef3
ld hl, UnknownText_0x12f00
.NotEnoughHP
ld hl, .Text_NotEnoughHP
call PrintText
.asm_12ef9
.finish
xor a
ld [PartyMenuActionText], a
ld a, $3
ret
; 12f00
UnknownText_0x12f00: ; 0x12f00
.Text_NotEnoughHP: ; 0x12f00
; Not enough HP!
text_jump UnknownText_0x1c1ce3
db "@"
; 0x12f05
Function12f05: ; 12f05
.CheckMonHasEnoughHP: ; 12f05
; Need to have at least (MaxHP / 5) HP left.
ld a, MON_MAXHP
call GetPartyParamLocation
ld a, [hli]
ld [hDividend + 0], a
ld a, [hl]
ld [hDividend + 1], a
ld a, $5
ld a, 5
ld [hDivisor], a
ld b, $2
ld b, 2
call Divide
ld a, MON_HP + 1
call GetPartyParamLocation
@@ -1423,28 +1424,28 @@ Function12f05: ; 12f05
MonMenu_Headbutt: ; 12f26
callba HeadbuttFunction
ld a, [wd0ec]
ld a, [wFieldMoveSucceeded]
cp $1
jr nz, .asm_12f38
jr nz, .Fail
ld b, $4
ld a, $2
ret
.asm_12f38
.Fail
ld a, $3
ret
; 12f3b
MonMenu_RockSmash: ; 12f3b
callba RockSmashFunction
ld a, [wd0ec]
ld a, [wFieldMoveSucceeded]
cp $1
jr nz, .asm_12f4d
jr nz, .Fail
ld b, $4
ld a, $2
ret
.asm_12f4d
.Fail
ld a, $3
ret
; 12f50

2
engine/town_map.asm
View File

@@ -147,7 +147,7 @@ Function91a04: ; 91a04
ld e, $1
.okay
callba Function91ae1
callba PokegearMap
ld a, $7
ld bc, 6
hlcoord 1, 0