You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Remove original maps and object events (#1)
This commit is contained in:
@@ -6038,13 +6038,6 @@ LoadEnemyMon:
|
||||
jr nc, .GenerateDVs
|
||||
|
||||
.CheckMagikarpArea:
|
||||
; BUG: Magikarp in Lake of Rage are shorter, not longer (see docs/bugs_and_glitches.md)
|
||||
ld a, [wMapGroup]
|
||||
cp GROUP_LAKE_OF_RAGE
|
||||
jr z, .Happiness
|
||||
ld a, [wMapNumber]
|
||||
cp MAP_LAKE_OF_RAGE
|
||||
jr z, .Happiness
|
||||
; 40% chance of not flooring
|
||||
call Random
|
||||
cp 39 percent + 1
|
||||
|
@@ -70,11 +70,6 @@ PlayBattleMusic:
|
||||
and a
|
||||
jr nz, .trainermusic
|
||||
|
||||
farcall RegionCheck
|
||||
ld a, e
|
||||
and a
|
||||
jr nz, .kantowild
|
||||
|
||||
ld de, MUSIC_JOHTO_WILD_BATTLE
|
||||
ld a, [wTimeOfDay]
|
||||
cp NITE_F
|
||||
@@ -82,10 +77,6 @@ PlayBattleMusic:
|
||||
ld de, MUSIC_JOHTO_WILD_BATTLE_NIGHT
|
||||
jr .done
|
||||
|
||||
.kantowild
|
||||
ld de, MUSIC_KANTO_WILD_BATTLE
|
||||
jr .done
|
||||
|
||||
.trainermusic
|
||||
ld de, MUSIC_CHAMPION_BATTLE
|
||||
cp CHAMPION
|
||||
@@ -124,21 +115,7 @@ PlayBattleMusic:
|
||||
jr .done
|
||||
|
||||
.othertrainer
|
||||
ld a, [wLinkMode]
|
||||
and a
|
||||
jr nz, .johtotrainer
|
||||
|
||||
farcall RegionCheck
|
||||
ld a, e
|
||||
and a
|
||||
jr nz, .kantotrainer
|
||||
|
||||
.johtotrainer
|
||||
ld de, MUSIC_JOHTO_TRAINER_BATTLE
|
||||
jr .done
|
||||
|
||||
.kantotrainer
|
||||
ld de, MUSIC_KANTO_TRAINER_BATTLE
|
||||
|
||||
.done
|
||||
call PlayMusic
|
||||
|
Reference in New Issue
Block a user