DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the "See ya!" option in the PC menu not working properly, fixed mispositioning of text in Debug features that edit Game

Browse Source 
Switches/Variables
This commit is contained in:
Maruno17
2022-07-03 15:58:37 +01:00
parent 94c6b6db0c
commit 6dd88e49e1
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/012_Overworld/002_Battle triggering/004_Overworld_EncounterModifiers.rb
View File

@@ -32,7 +32,7 @@ EventHandlers.add(:on_wild_pokemon_created, :level_depends_on_party,
# Note that you can only modify a partner trainer's Pokémon, and not the trainer # Note that you can only modify a partner trainer's Pokémon, and not the trainer
# themselves nor their items this way, as those are generated from scratch # themselves nor their items this way, as those are generated from scratch
# before each battle. # before each battle.
#EventHandlers.trigger(:on_trainer_load, :put_a_name_here, #EventHandlers.add(:on_trainer_load, :put_a_name_here,
# proc { |trainer| # proc { |trainer|
# if trainer # An NPCTrainer object containing party/items/lose text, etc. # if trainer # An NPCTrainer object containing party/items/lose text, etc.
# YOUR CODE HERE # YOUR CODE HERE

13
Data/Scripts/016_UI/019_UI_PC.rb
View File

@@ -180,6 +180,12 @@ MenuHandlers.add(:pc_menu, :pokemon_storage, {
_INTL("Return to the previous menu.")], -1, command) _INTL("Return to the previous menu.")], -1, command)
break if command < 0 break if command < 0
case command case command
when 0 # Organize
pbFadeOutIn {
scene = PokemonStorageScene.new
screen = PokemonStorageScreen.new(scene, $PokemonStorage)
screen.pbStartScreen(command)
}
when 1 # Withdraw when 1 # Withdraw
if $PokemonStorage.party_full? if $PokemonStorage.party_full?
pbMessage(_INTL("Your party is full!")) pbMessage(_INTL("Your party is full!"))
@@ -194,12 +200,9 @@ MenuHandlers.add(:pc_menu, :pokemon_storage, {
pbMessage(_INTL("Can't deposit the last Pokémon!")) pbMessage(_INTL("Can't deposit the last Pokémon!"))
next next
end end
else
break
end end
pbFadeOutIn {
scene = PokemonStorageScene.new
screen = PokemonStorageScreen.new(scene, $PokemonStorage)
screen.pbStartScreen(command)
}
end end
next false next false
} }

9
Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb
View File

@@ -62,16 +62,17 @@ class SpriteWindow_DebugVariables < Window_DrawableCommand
def shadowtext(x, y, w, h, t, align = 0, colors = 0) def shadowtext(x, y, w, h, t, align = 0, colors = 0)
width = self.contents.text_size(t).width width = self.contents.text_size(t).width
case align case align
when 1 # Right aligned when 1 # Right aligned
x += (w - width) x += (w - width)
when 2 # Centre aligned when 2 # Centre aligned
x += (w / 2) - (width / 2) x += (w / 2) - (width / 2)
end end
y += 8 # TEXT OFFSET
base = Color.new(12 * 8, 12 * 8, 12 * 8) base = Color.new(12 * 8, 12 * 8, 12 * 8)
case colors case colors
when 1 # Red when 1 # Red
base = Color.new(168, 48, 56) base = Color.new(168, 48, 56)
when 2 # Green when 2 # Green
base = Color.new(0, 144, 0) base = Color.new(0, 144, 0)
end end
pbDrawShadowText(self.contents, x, y, [width, w].max, h, t, base, Color.new(26 * 8, 26 * 8, 25 * 8)) pbDrawShadowText(self.contents, x, y, [width, w].max, h, t, base, Color.new(26 * 8, 26 * 8, 25 * 8))