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

Badge and move constants in Strength and Surf field effects.

Browse Source
This commit is contained in:
yenatch 2014-07-18 10:29:17 -07:00
parent 2b1cc7f270
commit 3110fd28e2
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
main.asm
View File

@ -9339,16 +9339,16 @@ Jumptable_c91a: ; c91a (3:491a)
; no known jump sources ; no known jump sources
Functionc922: ; c922 (3:4922) Functionc922: ; c922 (3:4922)
ld de, $1e ld de, ENGINE_FOGBADGE
call CheckBadge call CheckBadge
jr c, .asm_c956 jr c, .asm_c956
ld hl, BikeFlags ; $dbf5 ld hl, BikeFlags
bit 1, [hl] bit 1, [hl] ; always on bike
jr nz, .asm_c95c jr nz, .asm_c95c
ld a, [PlayerState] ; $d95d ld a, [PlayerState]
cp $4 cp PLAYER_SURF
jr z, .asm_c959 jr z, .asm_c959
cp $8 cp PLAYER_SURF_PIKA
jr z, .asm_c959 jr z, .asm_c959
call GetFacingTileCoord call GetFacingTileCoord
call GetTileCollision call GetTileCollision
@ -9422,18 +9422,18 @@ Functionc9a2: ; c9a2
; c9a9 ; c9a9
UsedSurfText: ; c9a9 UsedSurfText: ; c9a9
TX_FAR _UsedSurfText ; [MONSTER] used TX_FAR _UsedSurfText
db "@" ; SURF! db "@"
; c9ae ; c9ae
CantSurfText: ; c9ae CantSurfText: ; c9ae
TX_FAR _CantSurfText ; You can't SURF TX_FAR _CantSurfText
db "@" ; here. db "@"
; c9b3 ; c9b3
AlreadySurfingText: ; c9b3 AlreadySurfingText: ; c9b3
TX_FAR _AlreadySurfingText ; You're already TX_FAR _AlreadySurfingText
db "@" ; SURFING. db "@"
; c9b8 ; c9b8
@ -10143,25 +10143,31 @@ UnknownText_0xcd73: ; 0xcd73
; 0xcd78 ; 0xcd78
Functioncd78: ; cd78 Functioncd78: ; cd78
ld d, $46 ld d, STRENGTH
call CheckPartyMove call CheckPartyMove
jr c, .asm_cd92 jr c, .asm_cd92
ld de, $1d
ld de, ENGINE_PLAINBADGE
call CheckEngineFlag call CheckEngineFlag
jr c, .asm_cd92 jr c, .asm_cd92
ld hl, BikeFlags ; $dbf5 ld hl, BikeFlags ; $dbf5
bit 0, [hl] bit 0, [hl]
jr z, .asm_cd96 jr z, .asm_cd96
ld a, $2
ld a, 2
jr .asm_cd99 jr .asm_cd99
.asm_cd92 .asm_cd92
ld a, $1 ld a, 1
jr .asm_cd99 jr .asm_cd99
.asm_cd96 .asm_cd96
xor a xor a
jr .asm_cd99 jr .asm_cd99
.asm_cd99 .asm_cd99
ld [ScriptVar], a ; $c2dd ld [ScriptVar], a
ret ret
; cd9d ; cd9d
@ -10521,7 +10527,7 @@ UnknownText_0xcf77: ; 0xcf77
; 0xcf7c ; 0xcf7c
Functioncf7c: ; cf7c Functioncf7c: ; cf7c
ld d, $f9 ld d, ROCK_SMASH
call CheckPartyMove call CheckPartyMove
jr nc, .asm_cf87 jr nc, .asm_cf87
ld a, $1 ld a, $1