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

Moved global/map metadata constants and schema into modules

Browse Source
This commit is contained in:
Maruno17
2020-10-16 22:05:38 +01:00
parent 71a4d09224
commit e82b5409fb
25 changed files with 170 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Data/Scripts/020_System and utilities/003_PSystem_FileUtilities.rb
View File

@@ -532,12 +532,12 @@ def pbGetWildBattleBGM(_wildParty) # wildParty is an array of Pokémon objects
ret = nil
if !ret
# Check map-specific metadata
music = pbGetMetadata($game_map.map_id,MetadataMapWildBattleBGM)
music = pbGetMetadata($game_map.map_id,MapMetadata::WILD_BATTLE_BGM)
ret = pbStringToAudioFile(music) if music && music!=""
end
if !ret
# Check global metadata
music = pbGetMetadata(0,MetadataWildBattleBGM)
music = pbGetMetadata(0,Metadata::WILD_BATTLE_BGM)
ret = pbStringToAudioFile(music) if music && music!=""
end
ret = pbStringToAudioFile("Battle wild") if !ret
@@ -551,12 +551,12 @@ def pbGetWildVictoryME
ret = nil
if !ret
# Check map-specific metadata
music = pbGetMetadata($game_map.map_id,MetadataMapWildVictoryME)
music = pbGetMetadata($game_map.map_id,MapMetadata::WILD_VICTORY_ME)
ret = pbStringToAudioFile(music) if music && music!=""
end
if !ret
# Check global metadata
music = pbGetMetadata(0,MetadataWildVictoryME)
music = pbGetMetadata(0,Metadata::WILD_VICTORY_ME)
ret = pbStringToAudioFile(music) if music && music!=""
end
ret = pbStringToAudioFile("Battle victory") if !ret
@@ -571,12 +571,12 @@ def pbGetWildCaptureME
ret = nil
if !ret
# Check map-specific metadata
music = pbGetMetadata($game_map.map_id,MetadataMapWildCaptureME)
music = pbGetMetadata($game_map.map_id,MapMetadata::WILD_CAPTURE_ME)
ret = pbStringToAudioFile(music) if music && music!=""
end
if !ret
# Check global metadata
music = pbGetMetadata(0,MetadataWildCaptureME)
music = pbGetMetadata(0,Metadata::WILD_CAPTURE_ME)
ret = pbStringToAudioFile(music) if music && music!=""
end
ret = pbStringToAudioFile("Battle capture success") if !ret
@@ -611,14 +611,14 @@ def pbGetTrainerBattleBGM(trainer) # can be a PokeBattle_Trainer or an array o
ret = pbStringToAudioFile(music) if music && music!=""
if !ret
# Check map-specific metadata
music = pbGetMetadata($game_map.map_id,MetadataMapTrainerBattleBGM)
music = pbGetMetadata($game_map.map_id,MapMetadata::TRAINER_BATTLE_BGM)
if music && music!=""
ret = pbStringToAudioFile(music)
end
end
if !ret
# Check global metadata
music = pbGetMetadata(0,MetadataTrainerBattleBGM)
music = pbGetMetadata(0,Metadata::TRAINER_BATTLE_BGM)
if music && music!=""
ret = pbStringToAudioFile(music)
end
@@ -635,12 +635,12 @@ def pbGetTrainerBattleBGMFromType(trainertype)
ret = pbStringToAudioFile(data[4]) if data && data[4]
if !ret
# Check map-specific metadata
music = pbGetMetadata($game_map.map_id,MetadataMapTrainerBattleBGM)
music = pbGetMetadata($game_map.map_id,MapMetadata::TRAINER_BATTLE_BGM)
ret = pbStringToAudioFile(music) if music && music!=""
end
if !ret
# Check global metadata
music = pbGetMetadata(0,MetadataTrainerBattleBGM)
music = pbGetMetadata(0,Metadata::TRAINER_BATTLE_BGM)
ret = pbStringToAudioFile(music) if music && music!=""
end
ret = pbStringToAudioFile("Battle trainer") if !ret
@@ -663,14 +663,14 @@ def pbGetTrainerVictoryME(trainer) # can be a PokeBattle_Trainer or an array o
end
if !ret
# Check map-specific metadata
music = pbGetMetadata($game_map.map_id,MetadataMapTrainerVictoryME)
music = pbGetMetadata($game_map.map_id,MapMetadata::TRAINER_VICTORY_ME)
if music && music!=""
ret = pbStringToAudioFile(music)
end
end
if !ret
# Check global metadata
music = pbGetMetadata(0,MetadataTrainerVictoryME)
music = pbGetMetadata(0,Metadata::TRAINER_VICTORY_ME)
if music && music!=""
ret = pbStringToAudioFile(music)
end

8
Data/Scripts/020_System and utilities/005_PSystem_Utilities.rb
View File

@@ -666,7 +666,7 @@ end
#===============================================================================
def pbChangePlayer(id)
return false if id<0 || id>=8
meta = pbGetMetadata(0,MetadataPlayerA+id)
meta = pbGetMetadata(0,Metadata::PLAYER_A+id)
return false if !meta
$Trainer.trainertype = meta[0] if $Trainer
$game_player.character_name = meta[1]
@@ -678,7 +678,7 @@ end
def pbGetPlayerGraphic
id = $PokemonGlobal.playerID
return "" if id<0 || id>=8
meta = pbGetMetadata(0,MetadataPlayerA+id)
meta = pbGetMetadata(0,Metadata::PLAYER_A+id)
return "" if !meta
return pbPlayerSpriteFile(meta[0])
end
@@ -686,7 +686,7 @@ end
def pbGetPlayerTrainerType
id = $PokemonGlobal.playerID
return 0 if id<0 || id>=8
meta = pbGetMetadata(0,MetadataPlayerA+id)
meta = pbGetMetadata(0,Metadata::PLAYER_A+id)
return 0 if !meta
return meta[0]
end
@@ -868,7 +868,7 @@ end
# no region was defined in the game's metadata. The ID numbers returned by
# this function depend on the current map's position metadata.
def pbGetCurrentRegion(defaultRegion=-1)
mappos = ($game_map) ? pbGetMetadata($game_map.map_id,MetadataMapPosition) : nil
mappos = ($game_map) ? pbGetMetadata($game_map.map_id,MapMetadata::MAP_POSITION) : nil
return (mappos) ? mappos[0] : defaultRegion
end