diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 22:56:36 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 22:56:36 -0500 |
| commit | 5c28d05bb40b47f084a34eb732da92c899e18db6 (patch) | |
| tree | b7e427bbb988bfdc51e347a87f6ab663c1f45a7b /engine/wildmons.asm | |
| parent | 8e1e583640fcb82cb8d6327a0174a892b4ba0ad2 (diff) | |
| parent | 2c789b64b1bfa9ec33d805d06ad3a7141e3871f1 (diff) | |
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
Diffstat (limited to 'engine/wildmons.asm')
| -rwxr-xr-x | engine/wildmons.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/wildmons.asm b/engine/wildmons.asm index 33e66ce07..287ffe6ac 100755 --- a/engine/wildmons.asm +++ b/engine/wildmons.asm @@ -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 |