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:
@@ -59,7 +59,7 @@ Route32CooltrainerMContinueScene:
|
||||
closetext
|
||||
end
|
||||
|
||||
.Unused:
|
||||
.Unreferenced:
|
||||
writetext Route32CooltrainerMText_UnusedSproutTower
|
||||
waitbutton
|
||||
closetext
|
||||
@@ -837,7 +837,7 @@ BirdKeeperPeterAfterText:
|
||||
cont "in VIOLET CITY."
|
||||
done
|
||||
|
||||
; possibly unused
|
||||
; unused
|
||||
Route32UnusedText:
|
||||
text "The fishermen"
|
||||
line "yelled at me for"
|
||||
|
Reference in New Issue
Block a user