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

Make reviewed fixes; standardize on " + "

Browse Source
This commit is contained in:
Rangi 2018-07-29 01:40:23 -04:00
parent 8498394701
commit c9cb67141b
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/battle/core.asm
View File

@ -5989,7 +5989,7 @@ LoadEnemyMon:
; Used for Ho-Oh, Lugia and Snorlax encounters ; Used for Ho-Oh, Lugia and Snorlax encounters
ld a, [wBattleType] ld a, [wBattleType]
cp BATTLETYPE_FORCEITEM cp BATTLETYPE_FORCEITEM
ld a, [wBaseItems] ld a, [wBaseItem1]
jr z, .UpdateItem jr z, .UpdateItem
; Failing that, it's all up to chance ; Failing that, it's all up to chance
@ -6007,9 +6007,9 @@ LoadEnemyMon:
; From there, an 8% chance for Item2 ; From there, an 8% chance for Item2
call BattleRandom call BattleRandom
cp 8 percent ; 8% of 25% = 2% Item2 cp 8 percent ; 8% of 25% = 2% Item2
ld a, [wBaseItems] ld a, [wBaseItem1]
jr nc, .UpdateItem jr nc, .UpdateItem
ld a, [wBaseItems+1] ld a, [wBaseItem2]
.UpdateItem: .UpdateItem:
ld [wEnemyMonItem], a ld [wEnemyMonItem], a

2
engine/overworld/events.asm
View File

@ -983,7 +983,7 @@ PlayerEventScriptPointers:
dba Script_OverworldWhiteout ; PLAYEREVENT_WHITEOUT dba Script_OverworldWhiteout ; PLAYEREVENT_WHITEOUT
dba HatchEggScript ; PLAYEREVENT_HATCH dba HatchEggScript ; PLAYEREVENT_HATCH
dba ChangeDirectionScript ; PLAYEREVENT_JOYCHANGEFACING dba ChangeDirectionScript ; PLAYEREVENT_JOYCHANGEFACING
dba Invalid_0x96c2d ; 10 dba Invalid_0x96c2d ; (NUM_PLAYER_EVENTS)
Invalid_0x96c2d: Invalid_0x96c2d:
end end