pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #180 from yenatch/master

Browse Source 
label renaming
This commit is contained in:
Bryan Bishop 2013-08-31 07:20:25 -07:00
commit 97ef590f9e
10 changed files with 508 additions and 518 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
battle/ai/scoring.asm
View File

@ -129,7 +129,7 @@ AIScoring_RedStatMods: ; 385e0
jr .checkmove
.discourage
call RNG
call Random
cp 30
jr c, .checkmove
inc [hl]
@ -430,7 +430,7 @@ AIScoring_LeechHit: ; 387f7
ret
.asm_38815
call RNG
call Random
cp $64
ret c
@ -575,7 +575,7 @@ AIScoring_Explosion: ; 388a6
call AICheckEnemyQuarterHP
ret nc
call RNG
call Random
cp 20
ret c
@ -588,7 +588,7 @@ AIScoring_Explosion: ; 388a6
AIScoring_DreamEater: ; 388ca
call RNG
call Random
cp $19
ret c
@ -612,7 +612,7 @@ AIScoring_EvasionUp: ; 388d4
bit 0, a
jr nz, .asm_388ef
call RNG
call Random
cp $b2
jr nc, .asm_38911
@ -628,7 +628,7 @@ AIScoring_EvasionUp: ; 388d4
jr nc, .asm_3890f
call RNG
call Random
cp $a
jr c, .asm_388ef
@ -683,7 +683,7 @@ AIScoring_EvasionUp: ; 388d4
ret
.asm_38938
call RNG
call Random
cp $50
ret c
dec [hl]
@ -744,7 +744,7 @@ AIScoring_MirrorMove: ; 3895b
call AICompareSpeed
ret nc
call RNG
call Random
cp $19
ret c
@ -766,7 +766,7 @@ AIScoring_AccuracyDown: ; 38985
bit 0, a
jr nz, .asm_3899d
call RNG
call Random
cp $b2
jr nc, .asm_389bf
@ -782,7 +782,7 @@ AIScoring_AccuracyDown: ; 38985
jr nc, .asm_389bd
call RNG
call Random
cp $a
jr c, .asm_3899d
@ -837,7 +837,7 @@ AIScoring_AccuracyDown: ; 38985
ret
.asm_389e6
call RNG
call Random
cp $50
ret c
dec [hl]
@ -878,7 +878,7 @@ AIScoring_Haze: ; 389f5
.asm_38a12
pop hl
call RNG
call Random
cp $28
ret c
dec [hl]
@ -894,7 +894,7 @@ AIScoring_Haze: ; 389f5
AIScoring_Bide: ; 38a1e
call AICheckEnemyMaxHP
ret c
call RNG
call Random
cp $19
ret c
inc [hl]
@ -926,7 +926,7 @@ AIScoring_Moonlight: ; 38a3a
ret
.asm_38a45
call RNG
call Random
cp $19
ret c
dec [hl]
@ -948,7 +948,7 @@ AIScoring_LightScreen:
AIScoring_Reflect: ; 38a54
call AICheckEnemyMaxHP
ret c
call RNG
call Random
cp $14
ret c
inc [hl]
@ -1041,7 +1041,7 @@ AIScoring_Unused2B: ; 38a9c
ret c
.asm_38acd
call RNG
call Random
cp $c8
ret c
@ -1061,7 +1061,7 @@ AIScoring_Unused2B: ; 38a9c
AIScoring_Confuse: ; 38adb
call AICheckPlayerHalfHP
ret c
call RNG
call Random
cp $19
jr c, .asm_38ae7
inc [hl]
@ -1156,7 +1156,7 @@ AIScoring_SpeedDownHit: ; 38b40
ret nz
call AICompareSpeed
ret c
call RNG
call Random
cp 30
ret c
dec [hl]
@ -1183,7 +1183,7 @@ AIScoring_HyperBeam: ; 38b63
ret
.asm_38b72
call RNG
call Random
cp 40
ret c
inc [hl]
@ -1334,7 +1334,7 @@ AIScoring_Counter: ; 38bf1
.asm_38c30
call RNG
call Random
cp $64
jr c, .asm_38c38
@ -1388,7 +1388,7 @@ AIScoring_Encore: ; 38c3b
jr nc, .asm_38c81
.asm_38c78
call RNG
call Random
cp $46
ret c
dec [hl]
@ -1527,7 +1527,7 @@ AIScoring_Spite: ; 38cd5
cp $f
jr nc, .asm_38d0b
call RNG
call Random
cp $64
ret nc
@ -1536,7 +1536,7 @@ AIScoring_Spite: ; 38cd5
ret
.asm_38d0d
call RNG
call Random
cp $64
ret c
dec [hl]
@ -1700,7 +1700,7 @@ AIScoring_Conversion2: ; 38d98
ret
.asm_38dc9
call RNG
call Random
cp $19
ret c
@ -1722,7 +1722,7 @@ AIScoring_Disable: ; 38dd1
pop hl
jr nc, .asm_38dee
call RNG
call Random
cp 100
ret c
dec [hl]
@ -1734,7 +1734,7 @@ AIScoring_Disable: ; 38dd1
ret nz
.asm_38df3
call RNG
call Random
cp 20
ret c
inc [hl]
@ -1961,7 +1961,7 @@ AIScoring_Protect: ; 38ed2
inc [hl]
.asm_38f14
call RNG
call Random
cp 20
ret c
inc [hl]
@ -1985,14 +1985,14 @@ AIScoring_Foresight: ; 38f1d
cp GHOST
jr z, .asm_38f41
call RNG
call Random
cp 20
ret c
inc [hl]
ret
.asm_38f41
call RNG
call Random
cp 100
ret c
dec [hl]
@ -2169,7 +2169,7 @@ AIScoring_Rollout: ; 38fef
cp 8
jr nc, .asm_39020
call RNG
call Random
cp 200
ret nc
dec [hl]
@ -2196,7 +2196,7 @@ AIScoring_Attract: ; 39026
ret
.asm_39032
call RNG
call Random
cp 200
ret nc
dec [hl]
@ -2558,7 +2558,7 @@ AIScoring_MirrorCoat: ; 3918b
.asm_391ca
call RNG
call Random
cp 100
jr c, .asm_391d2
dec [hl]
@ -2634,7 +2634,7 @@ AIScoring_Solarbeam: ; 3920b
cp WEATHER_RAIN
ret nz
call RNG
call Random
cp 25 ; 1/10
ret c
@ -2657,7 +2657,7 @@ AIScoring_Thunder: ; 39225
cp WEATHER_SUN
ret nz
call RNG
call Random
cp 25 ; 1/10
ret c
@ -3150,7 +3150,7 @@ AIScoring_Cautious: ; 39418
pop hl
jr nc, .asm_39425
call RNG
call Random
cp 230
ret nc
@ -3274,7 +3274,7 @@ AIScoring_Risky: ; 394a9
call AICheckEnemyMaxHP
jr c, .nextmove
call RNG
call Random
cp 200 ; 1/5
jr c, .nextmove
@ -3347,14 +3347,14 @@ AIGetEnemyMove: ; 39508
Function_0x39521: ; 39521
call RNG
call Random
cp 50 ; 1/5
ret
; 39527
Function_0x39527: ; 39527
call RNG
call Random
cp $80 ; 1/2
ret
; 3952d

358
battle/effect_commands.asm
View File

File diff suppressed because it is too large Load Diff

2
constants/pokemon_constants.asm
View File

@ -1,3 +1,5 @@
NUM_POKEMON EQU 251
BULBASAUR EQU 1
IVYSAUR EQU 2
VENUSAUR EQU 3

8
engine/scripting.asm
View File

@ -1988,7 +1988,7 @@ Script_random: ; 0x97640
ld b, a
.asm_97653
push bc
call RNG
call Random
pop bc
ld a, [$ffe1]
cp b
@ -1996,7 +1996,7 @@ Script_random: ; 0x97640
jr .asm_97666 ; 0x9765d $7
.asm_9765f
push bc
call RNG
call Random
pop bc
ld a, [$ffe1]
.asm_97666
@ -2217,7 +2217,7 @@ Script_readcoins: ; 0x97747
call Unknown_0x97771
ld hl, StringBuffer1
ld de, $d855
ld de, Coins
ld bc, $4206
call PrintNum
ld de, StringBuffer1
@ -2363,7 +2363,7 @@ Script_checkitem: ; 0x97812
call GetScriptByte
ld [$d106], a
ld hl, $d892
call Function2f79
call PickUpItem
ret nc
ld a, $1
ld [$c2dd], a

4
items/item_effects.asm
View File

@ -166,7 +166,7 @@ ParkBall: ; e8a2
.asm_e98e
ld b, a
ld [MagikarpLength], a
call RNG
call Random
cp b
ld a, $0
@ -1212,7 +1212,7 @@ BitterBerry: ; f16a
call $7789
ld hl, $4d81
call FarBattleTextBox
call StdBattleTextBox
ld a, $0

563
main.asm
View File

File diff suppressed because it is too large Load Diff

4
stats/battle_tower.asm
View File

@ -15,7 +15,7 @@ Function1f8000: ; 1f8000
ld a, [hRandomAdd]
ld b, a
.asm_1f8022
call RNG
call Random
ld a, [hRandomAdd]
add b
ld b, a
@ -83,7 +83,7 @@ Function1f8081: ; 1f8081
ld a, [hRandomAdd]
ld b, a
.asm_1f8099
call RNG
call Random
ld a, [hRandomAdd]
add b
ld b, a

2
stats/odd_eggs.asm
View File

@ -1,7 +1,7 @@
GiveOddEgg: ; 1fb4b6
; Figure out which egg to give.
call RNG
call Random
ld hl, .Probabilities
ld c, 0
ld b, c

4
stats/wild/fish.asm
View File

@ -39,7 +39,7 @@ Fish: ; 9241a
; Fish for monsters with rod b from encounter data in FishGroup at hl.
; Return monster e at level d.
call RNG
call Random
; Got a bite?
cp [hl]
@ -59,7 +59,7 @@ Fish: ; 9241a
ld l, a
; Encounter chance for this monster:
call RNG
call Random
.CheckEncounter
cp [hl]

5
wram.asm
View File

@ -1712,7 +1712,10 @@ StatusFlags2: ; d84d
Money: ; d84e
ds 3
ds 6
ds 4
Coins: ; d855
ds 2
Badges:
JohtoBadges: ; d857