Random grammar fixes + fixes crash while using morning sun & moonlight in some indoor maps

This commit is contained in:
infinitefusion
2022-12-12 12:20:12 -05:00
parent 9ce39abad3
commit ecaa38d6c2
40 changed files with 9 additions and 6 deletions

View File

@@ -44,6 +44,9 @@ Special thanks to Aegide for helping to rip the sprites from the website
and to the owners of the respective fusion websites for accepting to share
their sprites.
Intro cinamatic
#####################
Kiwi
Custom fusion sprites
#####################

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -85,7 +85,8 @@ end
############### MORNING SUN / MOONLIGHT
HiddenMoveHandlers::CanUseMove.add(:MORNINGSUN,proc{|move,pkmn|
if !GameData::MapMetadata.get($game_map.map_id).outdoor_map
mapMetadata = GameData::MapMetadata.get($game_map.map_id)
if !mapMetadata || !mapMetadata.outdoor_map
Kernel.pbMessage(_INTL("Can't use that here."))
next false
end
@@ -107,7 +108,8 @@ HiddenMoveHandlers::UseMove.add(:MORNINGSUN,proc{|move,pokemon|
})
HiddenMoveHandlers::CanUseMove.add(:MOONLIGHT,proc{|move,pkmn|
if !GameData::MapMetadata.get($game_map.map_id).outdoor_map
mapMetadata = GameData::MapMetadata.get($game_map.map_id)
if !mapMetadata || !mapMetadata.outdoor_map
Kernel.pbMessage(_INTL("Can't use that here."))
next false
end

View File

@@ -30,6 +30,8 @@ def handleReplaceExistingSprites()
when 0 #Do not import
pbMessage("You can manually sort the new sprites in the /indexed folder to choose which ones you want to keep.")
pbMessage("You can also delete the ones you don't want to replace the main sprites and restart the game.")
pbMessage("Keep in mind that the game will take longer to load until these sprites are imported/removed.")
return
when 1 #Replace olds
spritesToReplaceList.each do |oldPath, newPath|

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

View File

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

View File

@@ -6,10 +6,6 @@
437,South,0,440,North,11
# Route 15 (444) - Route 14 (440)
444,East,0,440,West,6
# Area 5 (487) - Secret Area (489)
487,West,0,489,East,0
# Secret Area (489) - Area 1 (445)
489,65,85,445,0,0
# Vermillion City (19) - Route 6 (16)
19,North,1,16,South,0
# Vermillion City (19) - Route 11 (155)