Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
# Conflicts: # data/items/descriptions.asm # data/sprite_anims/framesets.asm # engine/crystal_colors.asm # engine/events/kurt.asm # engine/events/special.asm # engine/events/std_scripts.asm # engine/events_3.asm # engine/item_effects.asm # engine/namingscreen.asm # engine/scripting.asm # engine/stats_screen.asm # engine/trade_animation.asm # home/audio.asm # main.asm # maps/BattleTower1F.asm # maps/BattleTowerBattleRoom.asm # maps/BurnedTowerB1F.asm # maps/ElmsLab.asm # maps/GoldenrodDeptStore5F.asm # maps/GoldenrodUnderground.asm # maps/HallOfFame.asm # maps/MahoganyTown.asm # maps/ManiasHouse.asm # maps/MobileBattleRoom.asm # maps/MobileTradeRoomMobile.asm # maps/RadioTower2F.asm # maps/Route35NationalParkGate.asm # maps/Route36NationalParkGate.asm # maps/Route39Farmhouse.asm # tilesets/palette_maps.asm
This commit is contained in:
@@ -508,7 +508,7 @@ LookUpWildmonsForMapDE: ; 2a288
|
||||
; 2a2a0
|
||||
|
||||
|
||||
InitRoamMons: ; 2a2a0
|
||||
Special_InitRoamMons: ; 2a2a0
|
||||
; initialize wRoamMon structs
|
||||
|
||||
; species
|
||||
@@ -804,7 +804,7 @@ ValidateTempWildMonSpecies: ; 2a4a0
|
||||
|
||||
; Finds a rare wild Pokemon in the route of the trainer calling, then checks if it's been Seen already.
|
||||
; The trainer will then tell you about the Pokemon if you haven't seen it.
|
||||
RandomUnseenWildMon: ; 2a4ab
|
||||
Special_RandomUnseenWildMon: ; 2a4ab
|
||||
farcall GetCallerLocation
|
||||
ld d, b
|
||||
ld e, c
|
||||
@@ -877,7 +877,7 @@ RandomUnseenWildMon: ; 2a4ab
|
||||
db "@"
|
||||
; 0x2a51f
|
||||
|
||||
RandomPhoneWildMon: ; 2a51f
|
||||
Special_RandomPhoneWildMon: ; 2a51f
|
||||
farcall GetCallerLocation
|
||||
ld d, b
|
||||
ld e, c
|
||||
@@ -917,7 +917,7 @@ RandomPhoneWildMon: ; 2a51f
|
||||
jp CopyBytes
|
||||
; 2a567
|
||||
|
||||
RandomPhoneMon: ; 2a567
|
||||
Special_RandomPhoneMon: ; 2a567
|
||||
; Get a random monster owned by the trainer who's calling.
|
||||
farcall GetCallerLocation
|
||||
ld hl, TrainerGroups
|
||||
|
Reference in New Issue
Block a user