API tools faq
paste
Advertisement
Guest User

HMs→items

a guest
Jan 22nd, 2018
471
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 21.32 KB | None | 0 0
raw download clone embed print report
  1. commit a9c64871bedb8288aeea18ce325f311098c92fe9
  2. Date:   Sat Jan 13 22:56:10 2018 +0000
  3.  
  4.     Add items to replace HMs
  5.  
  6. diff --git a/Data/Scripts.rxdata b/Data/Scripts.rxdata
  7. index c0345d8..84993a5 100644
  8. --- a/Data/Scripts.rxdata
  9. +++ b/Data/Scripts.rxdata
  10. @@ -65301,24 +65301,33 @@ # PField_FieldMoves.rb
  11.  # Cut
  12.  #===============================================================================
  13.  def Kernel.pbCut
  14. +  item = getID(PBItems,:AX)
  15.    move = getID(PBMoves,:CUT)
  16.    movefinder = Kernel.pbCheckMove(move)
  17. -  if !pbCheckHiddenMoveBadge(BADGEFORCUT,false) || (!$DEBUG && !movefinder)
  18. +
  19. +  if $PokemonBag.pbHasItem?(item)
  20. +    message = _INTL("{1} used the {2}.",$Trainer.name,PBItems.getName(item))
  21. +    animate = false
  22. +  elsif pbCheckHiddenMoveBadge(BADGEFORCUT,false) && ($DEBUG || movefinder)
  23. +    speciesname = movefinder ? movefinder.name : $Trainer.name
  24. +    message = _INTL("{1} used {2}!",speciesname,PBMoves.getName(move))
  25. +    animate = true
  26. +  else
  27.      Kernel.pbMessage(_INTL("This tree looks like it can be cut down."))
  28.      return false
  29.    end
  30. +
  31.    Kernel.pbMessage(_INTL("This tree looks like it can be cut down!\1"))
  32.    if Kernel.pbConfirmMessage(_INTL("Would you like to cut it?"))
  33. -    speciesname = (movefinder) ? movefinder.name : $Trainer.name
  34. -    Kernel.pbMessage(_INTL("{1} used {2}!",speciesname,PBMoves.getName(move)))
  35. -    pbHiddenMoveAnimation(movefinder)
  36. +    Kernel.pbMessage(message)
  37. +    pbHiddenMoveAnimation(movefinder) if animate
  38.      return true
  39.    end
  40.    return false
  41.  end
  42.  
  43.  HiddenMoveHandlers::CanUseMove.add(:CUT,proc{|move,pkmn,showmsg|
  44. -   return false if !pbCheckHiddenMoveBadge(BADGEFORCUT,showmsg)
  45. +   return false if !($PokemonBag.pbHasItem?(:AX) || pbCheckHiddenMoveBadge(BADGEFORCUT,showmsg))
  46.     facingEvent = $game_player.pbFacingEvent
  47.     if !facingEvent || facingEvent.name!="Tree"
  48.       Kernel.pbMessage(_INTL("Can't use that here.")) if showmsg
  49. @@ -65328,7 +65337,9 @@ # PField_FieldMoves.rb
  50.  })
  51.  
  52.  HiddenMoveHandlers::UseMove.add(:CUT,proc{|move,pokemon|
  53. -   if !pbHiddenMoveAnimation(pokemon)
  54. +   if !pokemon
  55. +     Kernel.pbMessage(_INTL("{1} used the {2}.",$Trainer.name,PBItems.getName(PBItems::AX)))
  56. +   elsif !pbHiddenMoveAnimation(pokemon)
  57.       Kernel.pbMessage(_INTL("{1} used {2}!",pokemon.name,PBMoves.getName(move)))
  58.     end
  59.     facingEvent = $game_player.pbFacingEvent
  60. @@ -65412,16 +65423,28 @@ # PField_FieldMoves.rb
  61.  def Kernel.pbDive
  62.    divemap = pbGetMetadata($game_map.map_id,MetadataDiveMap)
  63.    return false if !divemap
  64. +
  65. +  item = getID(PBItems,:SCUBAGEAR)
  66.    move = getID(PBMoves,:DIVE)
  67.    movefinder = Kernel.pbCheckMove(move)
  68. -  if !pbCheckHiddenMoveBadge(BADGEFORDIVE,false) || (!$DEBUG && !movefinder)
  69. +
  70. +  if $PokemonBag.pbHasItem?(item)
  71. +    message = _INTL("{1} used the {2}.",$Trainer.name,PBItems.getName(item))
  72. +    confirmMessage = _INTL("The sea is deep here. Would you like to dive?")
  73. +    animate = false
  74. +  elsif pbCheckHiddenMoveBadge(BADGEFORDIVE,false) && ($DEBUG || movefinder)
  75. +    speciesname = movefinder ? movefinder.name : $Trainer.name
  76. +    message = _INTL("{1} used {2}!",speciesname,PBMoves.getName(move))
  77. +    confirmMessage = _INTL("The sea is deep here. Would you like to use Dive?")
  78. +    animate = true
  79. +  else
  80.      Kernel.pbMessage(_INTL("The sea is deep here. A Pokémon may be able to go underwater."))
  81.      return false
  82.    end
  83. -  if Kernel.pbConfirmMessage(_INTL("The sea is deep here. Would you like to use Dive?"))
  84. -    speciesname = (movefinder) ? movefinder.name : $Trainer.name
  85. -    Kernel.pbMessage(_INTL("{1} used {2}!",speciesname,PBMoves.getName(move)))
  86. -    pbHiddenMoveAnimation(movefinder)
  87. +
  88. +  if Kernel.pbConfirmMessage(confirmMessage)
  89. +    Kernel.pbMessage(message)
  90. +    pbHiddenMoveAnimation(movefinder) if animate
  91.      pbFadeOutIn(99999){
  92.         $game_temp.player_new_map_id    = divemap
  93.         $game_temp.player_new_x         = $game_player.x
  94. @@ -65449,16 +65472,28 @@ # PField_FieldMoves.rb
  95.      end
  96.    end
  97.    return if !divemap
  98. +
  99. +  item = getID(PBItems,:SCUBAGEAR)
  100.    move = getID(PBMoves,:DIVE)
  101.    movefinder = Kernel.pbCheckMove(move)
  102. -  if !pbCheckHiddenMoveBadge(BADGEFORDIVE,false) || (!$DEBUG && !movefinder)
  103. +
  104. +  if $PokemonBag.pbHasItem?(item)
  105. +    message = _INTL("{1} used the {2}.",$Trainer.name,PBItems.getName(item))
  106. +    confirmMessage = _INTL("Light is filtering down from above. Would you like to surface?")
  107. +    animate = false
  108. +  elsif pbCheckHiddenMoveBadge(BADGEFORDIVE,false) && ($DEBUG || movefinder)
  109. +    speciesname = movefinder ? movefinder.name : $Trainer.name
  110. +    message = _INTL("{1} used {2}!",speciesname,PBMoves.getName(move))
  111. +    confirmMessage = _INTL("Light is filtering down from above. Would you like to use Dive?")
  112. +    animate = true
  113. +  else
  114.      Kernel.pbMessage(_INTL("Light is filtering down from above. A Pokémon may be able to surface here."))
  115.      return false
  116.    end
  117. -  if Kernel.pbConfirmMessage(_INTL("Light is filtering down from above. Would you like to use Dive?"))
  118. -    speciesname = (movefinder) ? movefinder.name : $Trainer.name
  119. -    Kernel.pbMessage(_INTL("{1} used {2}!",speciesname,PBMoves.getName(move)))
  120. -    pbHiddenMoveAnimation(movefinder)
  121. +
  122. +  if Kernel.pbConfirmMessage(confirmMessage)
  123. +    Kernel.pbMessage(message)
  124. +    pbHiddenMoveAnimation(movefinder) if animate
  125.      pbFadeOutIn(99999){
  126.         $game_temp.player_new_map_id    = divemap
  127.         $game_temp.player_new_x         = $game_player.x
  128. @@ -65518,7 +65553,7 @@ # PField_FieldMoves.rb
  129.  }
  130.  
  131.  HiddenMoveHandlers::CanUseMove.add(:DIVE,proc{|move,pkmn,showmsg|
  132. -   return false if !pbCheckHiddenMoveBadge(BADGEFORDIVE,showmsg)
  133. +   return false if !($PokemonBag.pbHasItem?(:SCUBAGEAR) || pbCheckHiddenMoveBadge(BADGEFORDIVE,showmsg))
  134.     if $PokemonGlobal.diving
  135.       return true if DIVINGSURFACEANYWHERE
  136.       divemap = nil
  137. @@ -65559,7 +65594,9 @@ # PField_FieldMoves.rb
  138.       divemap = pbGetMetadata($game_map.map_id,MetadataDiveMap)
  139.     end
  140.     return false if !divemap
  141. -   if !pbHiddenMoveAnimation(pokemon)
  142. +   if !pokemon
  143. +     Kernel.pbMessage(_INTL("{1} used the {2}.",$Trainer.name,PBItems.getName(PBItems::SCUBAGEAR)))
  144. +   elsif !pbHiddenMoveAnimation(pokemon)
  145.       Kernel.pbMessage(_INTL("{1} used {2}!",pokemon.name,PBMoves.getName(move)))
  146.     end
  147.     pbFadeOutIn(99999){
  148. @@ -65722,23 +65759,34 @@ # PField_FieldMoves.rb
  149.  end
  150.  
  151.  def Kernel.pbRockSmash
  152. +  item = getID(PBItems,:PICKAX)
  153.    move = getID(PBMoves,:ROCKSMASH)
  154.    movefinder = Kernel.pbCheckMove(move)
  155. -  if !pbCheckHiddenMoveBadge(BADGEFORROCKSMASH,false) || (!$DEBUG && !movefinder)
  156. +
  157. +  if $PokemonBag.pbHasItem?(item)
  158. +    message = _INTL("{1} used the {2}.",$Trainer.name,PBItems.getName(item))
  159. +    confirmMessage = _INTL("This rock appears to be breakable. Would you like to use the {1}?",PBItems.getName(item))
  160. +    animate = false
  161. +  elsif pbCheckHiddenMoveBadge(BADGEFORROCKSMASH,false) && ($DEBUG || movefinder)
  162. +    speciesname = (movefinder) ? movefinder.name : $Trainer.name
  163. +    message = _INTL("{1} used {2}!",speciesname,PBMoves.getName(move))
  164. +    confirmMessage = _INTL("This rock appears to be breakable. Would you like to use Rock Smash?")
  165. +    animate = true
  166. +  else
  167.      Kernel.pbMessage(_INTL("It's a rugged rock, but a Pokémon may be able to smash it."))
  168.      return false
  169.    end
  170. -  if Kernel.pbConfirmMessage(_INTL("This rock appears to be breakable. Would you like to use Rock Smash?"))
  171. -    speciesname = (movefinder) ? movefinder.name : $Trainer.name
  172. -    Kernel.pbMessage(_INTL("{1} used {2}!",speciesname,PBMoves.getName(move)))
  173. -    pbHiddenMoveAnimation(movefinder)
  174. +
  175. +  if Kernel.pbConfirmMessage(confirmMessage)
  176. +    Kernel.pbMessage(message)
  177. +    pbHiddenMoveAnimation(movefinder) if animate
  178.      return true
  179.    end
  180.    return false
  181.  end
  182.  
  183.  HiddenMoveHandlers::CanUseMove.add(:ROCKSMASH,proc{|move,pkmn,showmsg|
  184. -   return false if !pbCheckHiddenMoveBadge(BADGEFORROCKSMASH,showmsg)
  185. +   return false if !($PokemonBag.pbHasItem?(:PICKAX) || pbCheckHiddenMoveBadge(BADGEFORROCKSMASH,showmsg))
  186.     facingEvent = $game_player.pbFacingEvent
  187.     if !facingEvent || facingEvent.name!="Rock"
  188.       Kernel.pbMessage(_INTL("Can't use that here.")) if showmsg
  189. @@ -65748,7 +65796,9 @@ # PField_FieldMoves.rb
  190.  })
  191.  
  192.  HiddenMoveHandlers::UseMove.add(:ROCKSMASH,proc{|move,pokemon|
  193. -   if !pbHiddenMoveAnimation(pokemon)
  194. +   if !pokemon
  195. +     Kernel.pbMessage(_INTL("{1} used the {2}.",$Trainer.name,PBItems.getName(PBItems::PICKAX)))
  196. +   elsif !pbHiddenMoveAnimation(pokemon)
  197.       Kernel.pbMessage(_INTL("{1} used {2}!",pokemon.name,PBMoves.getName(move)))
  198.     end
  199.     facingEvent = $game_player.pbFacingEvent
  200. @@ -65819,16 +65869,25 @@ # PField_FieldMoves.rb
  201.  #===============================================================================
  202.  def Kernel.pbSurf
  203.    return false if $game_player.pbHasDependentEvents?
  204. +  item = getID(PBItems,:FLOATY)
  205.    move = getID(PBMoves,:SURF)
  206.    movefinder = Kernel.pbCheckMove(move)
  207. -  if !pbCheckHiddenMoveBadge(BADGEFORSURF,false) || (!$DEBUG && !movefinder)
  208. +
  209. +  if $PokemonBag.pbHasItem?(item)
  210. +    message = _INTL("{1} used the {2}.",$Trainer.name,PBItems.getName(item))
  211. +    animate = false
  212. +  elsif pbCheckHiddenMoveBadge(BADGEFORSURF,false) && ($DEBUG || movefinder)
  213. +    speciesname = movefinder ? movefinder.name : $Trainer.name
  214. +    message = _INTL("{1} used {2}!",speciesname,PBMoves.getName(move))
  215. +    animate = true
  216. +  else
  217.      return false
  218.    end
  219. +
  220.    if Kernel.pbConfirmMessage(_INTL("The water is a deep blue...\nWould you like to surf on it?"))
  221. -    speciesname = (movefinder) ? movefinder.name : $Trainer.name
  222. -    Kernel.pbMessage(_INTL("{1} used {2}!",speciesname,PBMoves.getName(move)))
  223. +    Kernel.pbMessage(message)
  224.      Kernel.pbCancelVehicles
  225. -    pbHiddenMoveAnimation(movefinder)
  226. +    pbHiddenMoveAnimation(movefinder) if animate
  227.      surfbgm = pbGetMetadata(0,MetadataSurfBGM)
  228.      pbCueBGM(surfbgm,0.5) if surfbgm
  229.      pbStartSurfing
  230. @@ -65893,7 +65952,7 @@ # PField_FieldMoves.rb
  231.  }
  232.  
  233.  HiddenMoveHandlers::CanUseMove.add(:SURF,proc{|move,pkmn,showmsg|
  234. -   return false if !pbCheckHiddenMoveBadge(BADGEFORSURF,showmsg)
  235. +   return false if !($PokemonBag.pbHasItem?(:FLOATY) || pbCheckHiddenMoveBadge(BADGEFORSURF,showmsg))
  236.     if $PokemonGlobal.surfing
  237.       Kernel.pbMessage(_INTL("You're already surfing.")) if showmsg
  238.       return false
  239. @@ -65917,7 +65976,9 @@ # PField_FieldMoves.rb
  240.  HiddenMoveHandlers::UseMove.add(:SURF,proc{|move,pokemon|
  241.     $game_temp.in_menu = false
  242.     Kernel.pbCancelVehicles
  243. -   if !pbHiddenMoveAnimation(pokemon)
  244. +   if !pokemon
  245. +     Kernel.pbMessage(_INTL("{1} used the {2}.",$Trainer.name,PBItems.getName(PBItems::FLOATY)))
  246. +   elsif !pbHiddenMoveAnimation(pokemon)
  247.       Kernel.pbMessage(_INTL("{1} used {2}!",pokemon.name,PBMoves.getName(move)))
  248.     end
  249.     surfbgm = pbGetMetadata(0,MetadataSurfBGM)
  250. @@ -66073,16 +66134,27 @@ # PField_FieldMoves.rb
  251.  end
  252.  
  253.  def Kernel.pbWaterfall
  254. +  item = getID(PBItems,:MJUMPER)
  255.    move = getID(PBMoves,:WATERFALL)
  256.    movefinder = Kernel.pbCheckMove(move)
  257. -  if !pbCheckHiddenMoveBadge(BADGEFORWATERFALL,false) || (!$DEBUG && !movefinder)
  258. +
  259. +  if $PokemonBag.pbHasItem?(item)
  260. +    message = _INTL("{1} used the {2}.",$Trainer.name,PBItems.getName(item))
  261. +    confirmMessage = _INTL("It's a large waterfall. Would you like to use the Magikarp Jumper?")
  262. +    animate = false
  263. +  elsif pbCheckHiddenMoveBadge(BADGEFORWATERFALL,false) && ($DEBUG || movefinder)
  264. +    speciesname = movefinder ? movefinder.name : $Trainer.name
  265. +    message = _INTL("{1} used {2}!",speciesname,PBMoves.getName(move))
  266. +    confirmMessage = _INTL("It's a large waterfall. Would you like to use Waterfall?")
  267. +    animate = true
  268. +  else
  269.      Kernel.pbMessage(_INTL("A wall of water is crashing down with a mighty roar."))
  270.      return false
  271.    end
  272. -  if Kernel.pbConfirmMessage(_INTL("It's a large waterfall. Would you like to use Waterfall?"))
  273. -    speciesname = (movefinder) ? movefinder.name : $Trainer.name
  274. -    Kernel.pbMessage(_INTL("{1} used {2}!",speciesname,PBMoves.getName(move)))
  275. -    pbHiddenMoveAnimation(movefinder)
  276. +
  277. +  if Kernel.pbConfirmMessage(confirmMessage)
  278. +    Kernel.pbMessage(message)
  279. +    pbHiddenMoveAnimation(movefinder) if animate
  280.      pbAscendWaterfall
  281.      return true
  282.    end
  283. @@ -66101,7 +66173,7 @@ # PField_FieldMoves.rb
  284.  }
  285.  
  286.  HiddenMoveHandlers::CanUseMove.add(:WATERFALL,proc{|move,pkmn,showmsg|
  287. -   return false if !pbCheckHiddenMoveBadge(BADGEFORWATERFALL,showmsg)
  288. +   return false if !($PokemonBag.pbHasItem?(:MJUMPER) || pbCheckHiddenMoveBadge(BADGEFORWATERFALL,showmsg))
  289.     if Kernel.pbFacingTerrainTag!=PBTerrain::Waterfall
  290.       Kernel.pbMessage(_INTL("Can't use that here.")) if showmsg
  291.       return false
  292. @@ -66110,7 +66182,9 @@ # PField_FieldMoves.rb
  293.  })
  294.  
  295.  HiddenMoveHandlers::UseMove.add(:WATERFALL,proc{|move,pokemon|
  296. -   if !pbHiddenMoveAnimation(pokemon)
  297. +   if !pokemon
  298. +     Kernel.pbMessage(_INTL("{1} used the {2}.",$Trainer.name,PBItems.getName(PBItems::MJUMPER)))
  299. +   elsif !pbHiddenMoveAnimation(pokemon)
  300.       Kernel.pbMessage(_INTL("{1} used {2}!",pokemon.name,PBMoves.getName(move)))
  301.     end
  302.     Kernel.pbAscendWaterfall
  303. @@ -69579,6 +69653,51 @@ # PItem_ItemEffects.rb
  304.  
  305.  ItemHandlers::UseFromBag.copy(:ITEMFINDER,:DOWSINGMCHN,:DOWSINGMACHINE)
  306.  
  307. +ItemHandlers::UseFromBag.add(:AX,proc{|item|
  308. +  move = getConst(PBMoves,:CUT)
  309. +  if Kernel.pbCanUseHiddenMove?(nil,move,true)
  310. +    next 2
  311. +  else
  312. +    next 0
  313. +  end
  314. +})
  315. +
  316. +ItemHandlers::UseFromBag.add(:FLOATY,proc{|item|
  317. +  move = getConst(PBMoves,:SURF)
  318. +  if Kernel.pbCanUseHiddenMove?(nil,move,true)
  319. +    next 2
  320. +  else
  321. +    next 0
  322. +  end
  323. +})
  324. +
  325. +ItemHandlers::UseFromBag.add(:MJUMPER,proc{|item|
  326. +  move = getConst(PBMoves,:WATERFALL)
  327. +  if Kernel.pbCanUseHiddenMove?(nil,move,true)
  328. +    next 2
  329. +  else
  330. +    next 0
  331. +  end
  332. +})
  333. +
  334. +ItemHandlers::UseFromBag.add(:PICKAX,proc{|item|
  335. +  move = getConst(PBMoves,:ROCKSMASH)
  336. +  if Kernel.pbCanUseHiddenMove?(nil,move,true)
  337. +    next 2
  338. +  else
  339. +    next 0
  340. +  end
  341. +})
  342. +
  343. +ItemHandlers::UseFromBag.add(:SCUBAGEAR,proc{|item|
  344. +  move = getConst(PBMoves,:DIVE)
  345. +  if Kernel.pbCanUseHiddenMove?(nil,move,true)
  346. +    next 2
  347. +  else
  348. +    next 0
  349. +  end
  350. +})
  351. +
  352.  #===============================================================================
  353.  # ConfirmUseInField handlers
  354.  # Return values: true/false
  355. @@ -69859,6 +69978,56 @@ # PItem_ItemEffects.rb
  356.     next 1
  357.  })
  358.  
  359. +ItemHandlers::UseInField.add(:AX,proc{|item|
  360. +  move = getConst(PBMoves,:CUT)
  361. +  if Kernel.pbCanUseHiddenMove?(nil,move,false)
  362. +    Kernel.pbUseHiddenMove(nil,move)
  363. +    next 1
  364. +  else
  365. +    next 0
  366. +  end
  367. +})
  368. +
  369. +ItemHandlers::UseInField.add(:FLOATY,proc{|item|
  370. +  move = getConst(PBMoves,:SURF)
  371. +  if Kernel.pbCanUseHiddenMove?(nil,move,false)
  372. +    Kernel.pbUseHiddenMove(nil,move)
  373. +    next 1
  374. +  else
  375. +    next 0
  376. +  end
  377. +})
  378. +
  379. +ItemHandlers::UseInField.add(:MJUMPER,proc{|item|
  380. +  move = getConst(PBMoves,:WATERFALL)
  381. +  if Kernel.pbCanUseHiddenMove?(nil,move,false)
  382. +    Kernel.pbUseHiddenMove(nil,move)
  383. +    next 1
  384. +  else
  385. +    next 0
  386. +  end
  387. +})
  388. +
  389. +ItemHandlers::UseInField.add(:PICKAX,proc{|item|
  390. +  move = getConst(PBMoves,:ROCKSMASH)
  391. +  if Kernel.pbCanUseHiddenMove?(nil,move,false)
  392. +    Kernel.pbUseHiddenMove(nil,move)
  393. +    next 1
  394. +  else
  395. +    next 0
  396. +  end
  397. +})
  398. +
  399. +ItemHandlers::UseInField.add(:SCUBAGEAR,proc{|item|
  400. +  move = getConst(PBMoves,:DIVE)
  401. +  if Kernel.pbCanUseHiddenMove?(nil,move,false)
  402. +    Kernel.pbUseHiddenMove(nil,move)
  403. +    next 1
  404. +  else
  405. +    next 0
  406. +  end
  407. +})
  408. +
  409.  #===============================================================================
  410.  # UseOnPokemon handlers
  411.  #===============================================================================
  412. @@ -122154,23 +122323,30 @@ # Follow_Pokemon.rb
  413.    if $game_player.pbHasDependentEvents? && !$game_switches[Following_Activated_Switch]
  414.      return false
  415.    end
  416. -  if $DEBUG ||
  417. -    (HIDDENMOVESCOUNTBADGES ? $Trainer.numbadges>=BADGEFORSURF : $Trainer.badges[BADGEFORSURF])
  418. -    movefinder=Kernel.pbCheckMove(:SURF)
  419. -    if $DEBUG || movefinder
  420. -      if Kernel.pbConfirmMessage(_INTL("The water is dyed a deep blue...  Would you like to surf?"))
  421. -        speciesname=!movefinder ? $Trainer.name : movefinder.name
  422. -        Kernel.pbMessage(_INTL("{1} used Surf!",speciesname))
  423. -        pbHiddenMoveAnimation(movefinder)
  424. -        surfbgm=pbGetMetadata(0,MetadataSurfBGM)
  425. -        $PokemonTemp.dependentEvents.check_surf(true)
  426. -        if surfbgm
  427. -          pbCueBGM(surfbgm,0.5)
  428. -        end
  429. -        pbStartSurfing()
  430. -        return true
  431. -      end
  432. +  item = getID(PBItems,:FLOATY)
  433. +  movefinder=Kernel.pbCheckMove(:SURF)
  434. +
  435. +  if $PokemonBag.pbHasItem?(item)
  436. +    message = _INTL("{1} used the {2}.",$Trainer.name,PBItems.getName(item))
  437. +    animate = false
  438. +  elsif $DEBUG || (movefinder && (HIDDENMOVESCOUNTBADGES ? $Trainer.numbadges>=BADGEFORSURF : $Trainer.badges[BADGEFORSURF]))
  439. +    speciesname = movefinder ? movefinder.name : $Trainer.name
  440. +    message = _INTL("{1} used {2}!",speciesname,PBMoves.getName(move))
  441. +    animate = true
  442. +  else
  443. +    return false
  444. +  end
  445. +
  446. +  if Kernel.pbConfirmMessage(_INTL("The water is dyed a deep blue...  Would you like to surf?"))
  447. +    Kernel.pbMessage(message)
  448. +    pbHiddenMoveAnimation(movefinder) if animate
  449. +    surfbgm=pbGetMetadata(0,MetadataSurfBGM)
  450. +    $PokemonTemp.dependentEvents.check_surf(true)
  451. +    if surfbgm
  452. +      pbCueBGM(surfbgm,0.5)
  453.      end
  454. +    pbStartSurfing()
  455. +    return true
  456.    end
  457.    return false
  458.  end
  459. @@ -122366,7 +122542,7 @@ # Follow_Pokemon.rb
  460.      when PBMoves::SWEETSCENT
  461.        return true
  462.      else
  463. -      return HiddenMoveHandlers.triggerCanUseMove(move,pkmn)
  464. +      return HiddenMoveHandlers.triggerCanUseMove(move,pkmn,showmsg)
  465.      end
  466.    return false
  467.  end
  468. diff --git a/PBS/items.txt b/PBS/items.txt
  469. index 3f47124..9186207 100644
  470. --- a/PBS/items.txt
  471. +++ b/PBS/items.txt
  472. @@ -380,12 +380,12 @@
  473.  380,TM93,TM93,TM93s,4,3000,"The user shrouds itself in electricity and smashes into its target. It also damages the user a little.",3,0,0,WILDCHARGE
  474.  381,TM94,TM94,TM94s,4,1000,"The user attacks with a punch that can shatter a rock. It may also lower the target's Defense stat.",3,0,0,ROCKSMASH
  475.  382,TM95,TM95,TM95s,4,3000,"The user yells as if it is ranting about something, making the target's Sp. Atk stat decrease.",3,0,0,SNARL
  476. -383,HM01,HM01,HM01s,4,0,"The target is cut with a scythe or claw. It can also be used to cut down thin trees.",4,0,0,CUT
  477. -384,HM02,HM02,HM02s,4,0,"The user soars, then strikes on the second turn. It can also be used to fly to any familiar town.",4,0,0,FLY
  478. -385,HM03,HM03,HM03s,4,0,"It swamps the area around the user with a giant wave. It can also be used for crossing water.",4,0,0,SURF
  479. -386,HM04,HM04,HM04s,4,0,"The target is slugged with a punch thrown at maximum power. This move can also be used to move boulders.",4,0,0,STRENGTH
  480. -387,HM05,HM05,HM05s,4,0,"The user charges the target at an awesome speed. It can also be used to climb a waterfall.",4,0,0,WATERFALL
  481. -388,HM06,HM06,HM06s,4,0,"The user dives on the first turn, and floats up and attacks on the second. It can be used to dive in the ocean.",4,0,0,DIVE
  482. +383,TM96,TM96,TM96s,4,0,"The target is cut with a scythe or claw. It can also be used to cut down thin trees.",3,0,0,CUT
  483. +384,TM97,TM97,TM97s,4,0,"The user soars, then strikes on the second turn. It can also be used to fly to any familiar town.",3,0,0,FLY
  484. +385,TM98,TM98,TM98s,4,0,"It swamps the area around the user with a giant wave. It can also be used for crossing water.",3,0,0,SURF
  485. +386,TM99,TM99,TM99s,4,0,"The target is slugged with a punch thrown at maximum power. This move can also be used to move boulders.",3,0,0,STRENGTH
  486. +387,TM100,TM100,TM100s,4,0,"The user charges the target at an awesome speed. It can also be used to climb a waterfall.",3,0,0,WATERFALL
  487. +388,TM101,TM101,TM101s,4,0,"The user dives on the first turn, and floats up and attacks on the second. It can be used to dive in the ocean.",3,0,0,DIVE
  488.  389,CHERIBERRY,Cheri Berry,Cheri Berries,5,20,"It may be used or held by a Pokémon to recover from paralysis.",1,1,5,
  489.  390,CHESTOBERRY,Chesto Berry,Chesto Berries,5,20,"It may be used or held by a Pokémon to recover from sleep.",1,1,5,
  490.  391,PECHABERRY,Pecha Berry,Pecha Berries,5,20,"It may be used or held by a Pokémon to recover from poison.",1,1,5,
  491. @@ -522,4 +522,9 @@
  492.  522,DNASPLICERS,DNA Splicers,DNA Splicers,8,0,"A splicer that fuses Kyurem and a certain Pokémon. They are said to have been one in the beginning.",5,0,6,
  493.  523,REVEALGLASS,Reveal Glass,Reveal Glasses,8,0,"A glass that reveals the truth. It is a mysterious glass that returns a Pokémon back to its original shape.",5,0,6,
  494.  524,OVALCHARM,Oval Charm,Oval Charms,8,0,"An oval charm said to increase the chance of Eggs being found at the Day Care.",0,0,6,
  495. -525,SHINYCHARM,Shiny Charm,Shiny Charms,8,0,"A shiny charm said to increase the chance of finding a Shiny Pokémon.",0,0,6,
  496. \ No newline at end of file
  497. +525,SHINYCHARM,Shiny Charm,Shiny Charms,8,0,"A shiny charm said to increase the chance of finding a Shiny Pokémon.",0,0,6,
  498. +526,AX,Ax,Axes,8,0,"An ax for cutting down small trees.",2,0,6
  499. +527,FLOATY,Floaty,Floaties,8,0,"An inflatable tube used to swim across water.",2,0,6
  500. +528,MJUMPER,Magikarp Jumper,Magikarp Jumpers,8,0,"A strange device used to scale waterfalls.",2,0,6
  501. +529,PICKAX,Pickax,Pickaxes,8,0,"A pickax for breaking large rocks.",2,0,6
  502. +530,SCUBAGEAR,Scuba Gear,Scuba Gears,8,0,"A kit to be worn while exploring underwater.",2,0,6
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!