dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #525 from AsparagusEduardo/pokefirered_pokeemeraldSync2

Browse Source 
2nd batch of syncing with pokeemerald
This commit is contained in:
GriffinR
2022-08-01 16:56:48 -04:00
committed by GitHub
parent f5c4a07d56 b1bc05ec05
commit 49ea462d7f
231 changed files with 6334 additions and 6010 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/battle_script.inc
+22 -15
View File
@@ -109,10 +109,17 @@
.byte \battler .byte \battler
.endm .endm
.macro tryfaintmon battler:req, fromMove:req, ptr:req .macro tryfaintmon battler:req
.byte 0x19 .byte 0x19
.byte \battler .byte \battler
.byte \fromMove .byte FALSE
.4byte NULL
.endm
.macro tryfaintmon_spikes battler:req, ptr:req
.byte 0x19
.byte \battler
.byte TRUE
.4byte \ptr .4byte \ptr
.endm .endm
@@ -373,18 +380,18 @@
.byte 0x44 .byte 0x44
.endm .endm
.macro playanimation battler:req, param1:req, param2:req .macro playanimation battler:req, animType:req, arg=NULL
.byte 0x45 .byte 0x45
.byte \battler .byte \battler
.byte \param1 .byte \animType
.4byte \param2 .4byte \arg
.endm .endm
.macro playanimation2 battler:req, param1:req, param2:req .macro playanimation_var battler:req, animType:req, arg=NULL
.byte 0x46 .byte 0x46
.byte \battler .byte \battler
.4byte \param1 .4byte \animType
.4byte \param2 .4byte \arg
.endm .endm
.macro setgraphicalstatchangevalues .macro setgraphicalstatchangevalues
@@ -662,7 +669,7 @@
.byte 0x77 .byte 0x77
.endm .endm
.macro faintifabilitynotdamp .macro tryexplosion
.byte 0x78 .byte 0x78
.endm .endm
@@ -942,7 +949,7 @@
.byte 0xb5 .byte 0xb5
.endm .endm
.macro happinesstodamagecalculation .macro friendshiptodamagecalculation
.byte 0xb6 .byte 0xb6
.endm .endm
@@ -1025,7 +1032,7 @@
.byte 0xc8 .byte 0xc8
.endm .endm
.macro jumpifattackandspecialattackcannotfall ptr:req .macro trymemento ptr:req
.byte 0xc9 .byte 0xc9
.4byte \ptr .4byte \ptr
.endm .endm
@@ -1271,8 +1278,8 @@
various \battler, VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP various \battler, VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP
.endm .endm
.macro resetplayerfainted battler:req .macro resetplayerfainted
various \battler, VARIOUS_RESET_PLAYER_FAINTED various BS_ATTACKER, VARIOUS_RESET_PLAYER_FAINTED
.endm .endm
.macro various8 battler:req .macro various8 battler:req
@@ -1305,11 +1312,11 @@
.endm .endm
.macro chosenstatus1animation battler:req, status:req .macro chosenstatus1animation battler:req, status:req
chosenstatusanimation \battler 0x0 \status chosenstatusanimation \battler, 0x0, \status
.endm .endm
.macro chosenstatus2animation battler:req, status:req .macro chosenstatus2animation battler:req, status:req
chosenstatusanimation \battler 0x1 \status chosenstatusanimation \battler, 0x1, \status
.endm .endm
.macro sethword dst:req, value:req .macro sethword dst:req, value:req
asm/macros/music_voice.inc
+1 -1
View File
@@ -145,7 +145,7 @@
.byte 0xff, 0, 0xff, 0 .byte 0xff, 0, 0xff, 0
.endm .endm
.macro cry2 sample:req .macro cry_reverse sample:req
.byte 0x30, 60, 0, 0 .byte 0x30, 60, 0, 0
.4byte \sample .4byte \sample
.byte 0xff, 0, 0xff, 0 .byte 0xff, 0, 0xff, 0
charmap.txt
+8 -4
View File
@@ -427,7 +427,7 @@ HIGHLIGHT = FC 02 @ same as fc 01
SHADOW = FC 03 @ same as fc 01 SHADOW = FC 03 @ same as fc 01
COLOR_HIGHLIGHT_SHADOW = FC 04 @ takes 3 bytes COLOR_HIGHLIGHT_SHADOW = FC 04 @ takes 3 bytes
PALETTE = FC 05 @ used in credits PALETTE = FC 05 @ used in credits
SIZE = FC 06 @ note that anything other than "SMALL" is invalid FONT = FC 06 @ Given a font id, or use font constants below instead
RESET_SIZE = FC 07 RESET_SIZE = FC 07
PAUSE = FC 08 @ manually print the wait byte after this, havent mapped them PAUSE = FC 08 @ manually print the wait byte after this, havent mapped them
PAUSE_UNTIL_PRESS = FC 09 PAUSE_UNTIL_PRESS = FC 09
@@ -447,10 +447,14 @@ ENG = FC 16
PAUSE_MUSIC = FC 17 PAUSE_MUSIC = FC 17
RESUME_MUSIC = FC 18 RESUME_MUSIC = FC 18
@ font sizes @ fonts
SMALL = FC 06 00 FONT_0 = FC 06 00
BIG = FC 06 04 FONT_1 = FC 06 01
FONT_2 = FC 06 02
FONT_3 = FC 06 03
FONT_4 = FC 06 04
FONT_5 = FC 06 05
@ colors @ colors
data/battle_anim_scripts.s
+3 -2
View File
@@ -1,6 +1,7 @@
#include "constants/battle.h" #include "constants/battle.h"
#include "constants/battle_anim.h" #include "constants/battle_anim.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/sound.h"
#include "constants/moves.h" #include "constants/moves.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "asm/macros/battle_anim_script.inc" .include "asm/macros/battle_anim_script.inc"
@@ -5068,7 +5069,7 @@ Move_ROAR::
monbg ANIM_ATTACKER monbg ANIM_ATTACKER
monbgprio_28 0 monbgprio_28 0
setalpha 8, 8 setalpha 8, 8
createvisualtask SoundTask_PlayDoubleCry, 2, 0, 2 createvisualtask SoundTask_PlayDoubleCry, 2, 0, DOUBLE_CRY_ROAR
createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, 0, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, 0, 1
call RoarEffect call RoarEffect
delay 20 delay 20
@@ -5093,7 +5094,7 @@ RoarEffect::
Move_GROWL:: Move_GROWL::
loadspritegfx ANIM_TAG_NOISE_LINE loadspritegfx ANIM_TAG_NOISE_LINE
createvisualtask SoundTask_PlayDoubleCry, 2, 0, 255 createvisualtask SoundTask_PlayDoubleCry, 2, 0, DOUBLE_CRY_GROWL
call RoarEffect call RoarEffect
delay 10 delay 10
createvisualtask AnimTask_ShakeMon2, 2, 1, 1, 0, 9, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 1, 0, 9, 1
data/battle_scripts_1.s
+901 -919
View File
File diff suppressed because it is too large Load Diff
data/battle_scripts_2.s
+31 -31
View File
@@ -87,7 +87,7 @@ BattleScript_CaughtPokemonSkipNewDex::
trygivecaughtmonnick BattleScript_CaughtPokemonSkipNickname trygivecaughtmonnick BattleScript_CaughtPokemonSkipNickname
givecaughtmon givecaughtmon
printfromtable gCaughtMonStringIds printfromtable gCaughtMonStringIds
waitmessage 64 waitmessage B_WAIT_TIME_LONG
goto BattleScript_CaughtPokemonDone goto BattleScript_CaughtPokemonDone
BattleScript_CaughtPokemonSkipNickname:: BattleScript_CaughtPokemonSkipNickname::
@@ -104,27 +104,27 @@ BattleScript_OldMan_Pokedude_CaughtMessage::
BattleScript_ShakeBallThrow:: BattleScript_ShakeBallThrow::
printfromtable gBallEscapeStringIds printfromtable gBallEscapeStringIds
waitmessage 64 waitmessage B_WAIT_TIME_LONG
jumpifnotbattletype BATTLE_TYPE_SAFARI, BattleScript_CatchFailEnd jumpifnotbattletype BATTLE_TYPE_SAFARI, BattleScript_CatchFailEnd
jumpifbyte CMP_NOT_EQUAL, gNumSafariBalls, 0, BattleScript_CatchFailEnd jumpifbyte CMP_NOT_EQUAL, gNumSafariBalls, 0, BattleScript_CatchFailEnd
printstring STRINGID_OUTOFSAFARIBALLS printstring STRINGID_OUTOFSAFARIBALLS
waitmessage 64 waitmessage B_WAIT_TIME_LONG
setbyte gBattleOutcome, B_OUTCOME_NO_SAFARI_BALLS setbyte gBattleOutcome, B_OUTCOME_NO_SAFARI_BALLS
BattleScript_CatchFailEnd:: BattleScript_CatchFailEnd::
finishaction finishaction
BattleScript_TrainerBallBlock:: BattleScript_TrainerBallBlock::
waitmessage 64 waitmessage B_WAIT_TIME_LONG
printstring STRINGID_TRAINERBLOCKEDBALL printstring STRINGID_TRAINERBLOCKEDBALL
waitmessage 64 waitmessage B_WAIT_TIME_LONG
printstring STRINGID_DONTBEATHIEF printstring STRINGID_DONTBEATHIEF
waitmessage 64 waitmessage B_WAIT_TIME_LONG
finishaction finishaction
BattleScript_GhostBallDodge:: BattleScript_GhostBallDodge::
waitmessage 64 waitmessage B_WAIT_TIME_LONG
printstring STRINGID_ITDODGEDBALL printstring STRINGID_ITDODGEDBALL
waitmessage 64 waitmessage B_WAIT_TIME_LONG
finishaction finishaction
BattleScript_PlayerUseItem:: BattleScript_PlayerUseItem::
@@ -133,54 +133,54 @@ BattleScript_PlayerUseItem::
BattleScript_AIUseFullRestoreOrHpHeal:: BattleScript_AIUseFullRestoreOrHpHeal::
printstring STRINGID_EMPTYSTRING3 printstring STRINGID_EMPTYSTRING3
pause 48 pause B_WAIT_TIME_MED
playse SE_USE_ITEM playse SE_USE_ITEM
printstring STRINGID_TRAINER1USEDITEM printstring STRINGID_TRAINER1USEDITEM
waitmessage 64 waitmessage B_WAIT_TIME_LONG
useitemonopponent useitemonopponent
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_ATTACKER healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER datahpupdate BS_ATTACKER
printstring STRINGID_PKMNSITEMRESTOREDHEALTH printstring STRINGID_PKMNSITEMRESTOREDHEALTH
waitmessage 64 waitmessage B_WAIT_TIME_LONG
updatestatusicon BS_ATTACKER updatestatusicon BS_ATTACKER
moveendcase 15 moveendcase 15
finishaction finishaction
BattleScript_AIUseStatRestore:: BattleScript_AIUseStatRestore::
printstring STRINGID_EMPTYSTRING3 printstring STRINGID_EMPTYSTRING3
pause 48 pause B_WAIT_TIME_MED
playse SE_USE_ITEM playse SE_USE_ITEM
printstring STRINGID_TRAINER1USEDITEM printstring STRINGID_TRAINER1USEDITEM
waitmessage 64 waitmessage B_WAIT_TIME_LONG
useitemonopponent useitemonopponent
printfromtable gTrainerItemCuredStatusStringIds printfromtable gTrainerItemCuredStatusStringIds
waitmessage 64 waitmessage B_WAIT_TIME_LONG
updatestatusicon BS_ATTACKER updatestatusicon BS_ATTACKER
moveendcase 15 moveendcase 15
finishaction finishaction
BattleScript_AIUseXstat:: BattleScript_AIUseXstat::
printstring STRINGID_EMPTYSTRING3 printstring STRINGID_EMPTYSTRING3
pause 48 pause B_WAIT_TIME_MED
playse SE_USE_ITEM playse SE_USE_ITEM
printstring STRINGID_TRAINER1USEDITEM printstring STRINGID_TRAINER1USEDITEM
waitmessage 64 waitmessage B_WAIT_TIME_LONG
useitemonopponent useitemonopponent
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage 64 waitmessage B_WAIT_TIME_LONG
moveendcase 15 moveendcase 15
finishaction finishaction
BattleScript_AIUseGuardSpec:: BattleScript_AIUseGuardSpec::
printstring STRINGID_EMPTYSTRING3 printstring STRINGID_EMPTYSTRING3
pause 48 pause B_WAIT_TIME_MED
playse SE_USE_ITEM playse SE_USE_ITEM
printstring STRINGID_TRAINER1USEDITEM printstring STRINGID_TRAINER1USEDITEM
waitmessage 64 waitmessage B_WAIT_TIME_LONG
useitemonopponent useitemonopponent
printfromtable gMistUsedStringIds printfromtable gMistUsedStringIds
waitmessage 64 waitmessage B_WAIT_TIME_LONG
moveendcase 15 moveendcase 15
finishaction finishaction
@@ -193,16 +193,16 @@ BattleScript_UsePokeFlute::
checkpokeflute BS_ATTACKER checkpokeflute BS_ATTACKER
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 1, BattleScript_PokeFluteWakeUp jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 1, BattleScript_PokeFluteWakeUp
printstring STRINGID_POKEFLUTECATCHY printstring STRINGID_POKEFLUTECATCHY
waitmessage 64 waitmessage B_WAIT_TIME_LONG
goto BattleScript_PokeFluteEnd goto BattleScript_PokeFluteEnd
BattleScript_PokeFluteWakeUp:: BattleScript_PokeFluteWakeUp::
printstring STRINGID_POKEFLUTE printstring STRINGID_POKEFLUTE
waitmessage 64 waitmessage B_WAIT_TIME_LONG
fanfare MUS_POKE_FLUTE fanfare MUS_POKE_FLUTE
waitfanfare BS_ATTACKER waitfanfare BS_ATTACKER
printstring STRINGID_MONHEARINGFLUTEAWOKE printstring STRINGID_MONHEARINGFLUTEAWOKE
waitmessage 64 waitmessage B_WAIT_TIME_LONG
updatestatusicon BS_PLAYER2 updatestatusicon BS_PLAYER2
waitstate waitstate
BattleScript_PokeFluteEnd:: BattleScript_PokeFluteEnd::
@@ -210,29 +210,29 @@ BattleScript_PokeFluteEnd::
BattleScript_WatchesCarefully:: BattleScript_WatchesCarefully::
printfromtable gSafariPokeblockResultStringIds printfromtable gSafariPokeblockResultStringIds
waitmessage 64 waitmessage B_WAIT_TIME_LONG
playanimation BS_OPPONENT1, B_ANIM_SAFARI_REACTION, NULL playanimation BS_OPPONENT1, B_ANIM_SAFARI_REACTION
end2 end2
BattleScript_ThrowRock:: BattleScript_ThrowRock::
printstring STRINGID_THREWROCK printstring STRINGID_THREWROCK
waitmessage 64 waitmessage B_WAIT_TIME_LONG
playanimation BS_ATTACKER, B_ANIM_ROCK_THROW, NULL playanimation BS_ATTACKER, B_ANIM_ROCK_THROW
end2 end2
BattleScript_ThrowBait:: BattleScript_ThrowBait::
printstring STRINGID_THREWBAIT printstring STRINGID_THREWBAIT
waitmessage 64 waitmessage B_WAIT_TIME_LONG
playanimation BS_ATTACKER, B_ANIM_BAIT_THROW, NULL playanimation BS_ATTACKER, B_ANIM_BAIT_THROW
end2 end2
BattleScript_LeftoverWallyPrepToThrow:: BattleScript_LeftoverWallyPrepToThrow::
printstring STRINGID_RETURNMON printstring STRINGID_RETURNMON
waitmessage 64 waitmessage B_WAIT_TIME_LONG
returnatktoball returnatktoball
waitstate waitstate
trainerslidein BS_TARGET trainerslidein BS_TARGET
waitstate waitstate
printstring STRINGID_YOUTHROWABALLNOWRIGHT printstring STRINGID_YOUTHROWABALLNOWRIGHT
waitmessage 64 waitmessage B_WAIT_TIME_LONG
end2 end2
data/event_scripts.s
+1
View File
@@ -10,6 +10,7 @@
#include "constants/pokemon.h" #include "constants/pokemon.h"
#include "constants/moves.h" #include "constants/moves.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/sound.h"
#include "constants/species.h" #include "constants/species.h"
#include "constants/vars.h" #include "constants/vars.h"
#include "constants/battle.h" #include "constants/battle.h"
data/maps/BirthIsland_Exterior/scripts.inc
+1 -1
View File
@@ -80,7 +80,7 @@ BirthIsland_Exterior_EventScript_Deoxys::
applymovement LOCALID_DEOXYS, Movement_DeoxysApproach applymovement LOCALID_DEOXYS, Movement_DeoxysApproach
waitmovement 0 waitmovement 0
waitse waitse
playmoncry SPECIES_DEOXYS, 2 playmoncry SPECIES_DEOXYS, CRY_MODE_ENCOUNTER
delay 40 delay 40
waitmoncry waitmoncry
setvar VAR_LAST_TALKED, LOCALID_DEOXYS setvar VAR_LAST_TALKED, LOCALID_DEOXYS
data/maps/CeladonCity/scripts.inc
+1 -1
View File
@@ -45,7 +45,7 @@ CeladonCity_EventScript_Poliwrath::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_POLIWRATH, 0 playmoncry SPECIES_POLIWRATH, CRY_MODE_NORMAL
msgbox CeladonCity_Text_Poliwrath msgbox CeladonCity_Text_Poliwrath
closemessage closemessage
waitmoncry waitmoncry
data/maps/CeladonCity_Condominiums_1F/scripts.inc
+3 -3
View File
@@ -32,7 +32,7 @@ CeladonCity_Condominiums_1F_EventScript_Meowth::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_MEOWTH, 0 playmoncry SPECIES_MEOWTH, CRY_MODE_NORMAL
msgbox CeladonCity_Condominiums_1F_Text_Meowth msgbox CeladonCity_Condominiums_1F_Text_Meowth
waitmoncry waitmoncry
release release
@@ -42,7 +42,7 @@ CeladonCity_Condominiums_1F_EventScript_Clefairy::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_CLEFAIRY, 0 playmoncry SPECIES_CLEFAIRY, CRY_MODE_NORMAL
msgbox CeladonCity_Condominiums_1F_Text_Clefairy msgbox CeladonCity_Condominiums_1F_Text_Clefairy
waitmoncry waitmoncry
release release
@@ -52,7 +52,7 @@ CeladonCity_Condominiums_1F_EventScript_Nidoran::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_NIDORAN_F, 0 playmoncry SPECIES_NIDORAN_F, CRY_MODE_NORMAL
msgbox CeladonCity_Condominiums_1F_Text_Nidoran msgbox CeladonCity_Condominiums_1F_Text_Nidoran
waitmoncry waitmoncry
release release
data/maps/CeladonCity_DepartmentStore_Roof/text.inc
+1 -1
View File
@@ -1,7 +1,7 @@
CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink:: CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink::
.string "I'm thirsty!\n" .string "I'm thirsty!\n"
.string "I want something to drink!\p" .string "I want something to drink!\p"
.string "{SIZE}ÁGive her a drink?$" .string "{FONT_2}Give her a drink?$"
CeladonCity_DepartmentStore_Roof_Text_GiveWhichDrink:: CeladonCity_DepartmentStore_Roof_Text_GiveWhichDrink::
.string "Give her which drink?$" .string "Give her which drink?$"
data/maps/CeruleanCave_B1F/scripts.inc
+1 -1
View File
@@ -28,7 +28,7 @@ CeruleanCave_B1F_EventScript_Mewtwo::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_MEWTWO, 2 playmoncry SPECIES_MEWTWO, CRY_MODE_ENCOUNTER
message CeruleanCave_B1F_Text_Mew message CeruleanCave_B1F_Text_Mew
waitmessage waitmessage
waitmoncry waitmoncry
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc
+1 -1
View File
@@ -64,7 +64,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain::
CinnabarIsland_PokemonLab_ExperimentRoom_Text_HandedFossilToWeirdDoctor:: CinnabarIsland_PokemonLab_ExperimentRoom_Text_HandedFossilToWeirdDoctor::
.string "So!\n" .string "So!\n"
.string "You hurry and give me that!\p" .string "You hurry and give me that!\p"
.string "{SIZE}Á{PLAYER} handed over the\n" .string "{FONT_2}{PLAYER} handed over the\n"
.string "{STR_VAR_2} to the weird doctor.$" .string "{STR_VAR_2} to the weird doctor.$"
CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk:: CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk::
data/maps/FourIsland_IcefallCave_Back/scripts.inc
+1 -1
View File
@@ -62,7 +62,7 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
message FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou message FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou
waitmessage waitmessage
waitse waitse
playmoncry SPECIES_LAPRAS, 2 playmoncry SPECIES_LAPRAS, CRY_MODE_ENCOUNTER
waitbuttonpress waitbuttonpress
waitmoncry waitmoncry
applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat
data/maps/FourIsland_PokemonDayCare/scripts.inc
+2 -2
View File
@@ -36,7 +36,7 @@ FourIsland_PokemonDayCare_GiveMonToRaise::
goto_if_eq FourIsland_PokemonDayCare_OnlyOneAliveMonInParty goto_if_eq FourIsland_PokemonDayCare_OnlyOneAliveMonInParty
specialvar VAR_0x8005, GetSelectedMonNicknameAndSpecies specialvar VAR_0x8005, GetSelectedMonNicknameAndSpecies
waitse waitse
playmoncry VAR_0x8005, 0 playmoncry VAR_0x8005, CRY_MODE_NORMAL
msgbox DayCare_Text_WellRaiseYourMon msgbox DayCare_Text_WellRaiseYourMon
waitmoncry waitmoncry
special StoreSelectedPokemonInDaycare special StoreSelectedPokemonInDaycare
@@ -137,7 +137,7 @@ FourIsland_PokemonDayCare_RetrieveMon::
playse SE_RS_SHOP playse SE_RS_SHOP
msgbox DayCare_Text_HeresYourMon msgbox DayCare_Text_HeresYourMon
waitse waitse
playmoncry VAR_RESULT, 0 playmoncry VAR_RESULT, CRY_MODE_NORMAL
textcolor 3 textcolor 3
msgbox DayCare_Text_TookBackMon msgbox DayCare_Text_TookBackMon
call EventScript_RestorePrevTextColor call EventScript_RestorePrevTextColor
data/maps/LavenderTown_House1/scripts.inc
+1 -1
View File
@@ -18,7 +18,7 @@ LavenderTown_House1_EventScript_Cubone::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_CUBONE, 0 playmoncry SPECIES_CUBONE, CRY_MODE_NORMAL
msgbox LavenderTown_House1_Text_Cubone msgbox LavenderTown_House1_Text_Cubone
waitmoncry waitmoncry
release release
data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
+2 -2
View File
@@ -54,7 +54,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_Nidorino::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_NIDORINO, 0 playmoncry SPECIES_NIDORINO, CRY_MODE_NORMAL
msgbox LavenderTown_VolunteerPokemonHouse_Text_Nidorino msgbox LavenderTown_VolunteerPokemonHouse_Text_Nidorino
waitmoncry waitmoncry
release release
@@ -64,7 +64,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_Psyduck::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_PSYDUCK, 0 playmoncry SPECIES_PSYDUCK, CRY_MODE_NORMAL
msgbox LavenderTown_VolunteerPokemonHouse_Text_Psyduck msgbox LavenderTown_VolunteerPokemonHouse_Text_Psyduck
waitmoncry waitmoncry
release release
data/maps/MtEmber_Summit/scripts.inc
+1 -1
View File
@@ -29,7 +29,7 @@ MtEmber_Summit_EventScript_Moltres::
faceplayer faceplayer
setwildbattle SPECIES_MOLTRES, 50, ITEM_NONE setwildbattle SPECIES_MOLTRES, 50, ITEM_NONE
waitse waitse
playmoncry SPECIES_MOLTRES, 2 playmoncry SPECIES_MOLTRES, CRY_MODE_ENCOUNTER
message Text_Gyaoo message Text_Gyaoo
waitmessage waitmessage
waitmoncry waitmoncry
data/maps/NavelRock_Base/scripts.inc
+1 -1
View File
@@ -53,7 +53,7 @@ NavelRock_Base_EventScript_Lugia::
delay 30 delay 30
delay 50 delay 50
waitse waitse
playmoncry SPECIES_LUGIA, 2 playmoncry SPECIES_LUGIA, CRY_MODE_ENCOUNTER
waitmoncry waitmoncry
delay 20 delay 20
setvar VAR_0x8004, SPECIES_LUGIA setvar VAR_0x8004, SPECIES_LUGIA
data/maps/NavelRock_Summit/scripts.inc
+1 -1
View File
@@ -49,7 +49,7 @@ NavelRock_Summit_EventScript_HoOh::
setweather 0 setweather 0
doweather doweather
waitse waitse
playmoncry SPECIES_HO_OH, 2 playmoncry SPECIES_HO_OH, CRY_MODE_ENCOUNTER
delay 30 delay 30
waitmoncry waitmoncry
delay 60 delay 60
data/maps/PalletTown_RivalsHouse/text.inc
+2 -2
View File
@@ -62,8 +62,8 @@ PalletTown_RivalsHouse_Text_LookingNiceInNoTime::
.string "nice in no time.$" .string "nice in no time.$"
PalletTown_RivalsHouse_Text_ThereYouGoAllDone:: PalletTown_RivalsHouse_Text_ThereYouGoAllDone::
.string "{SIZE}Á{STR_VAR_1} looks dreamily content…\p" .string "{FONT_2}{STR_VAR_1} looks dreamily content…\p"
.string "{SIZE}ÈDAISY: There you go! All done.\n" .string "{FONT_5}DAISY: There you go! All done.\n"
.string "See? Doesn't it look nice?\p" .string "See? Doesn't it look nice?\p"
.string "Giggle…\n" .string "Giggle…\n"
.string "It's such a cute POKéMON.$" .string "It's such a cute POKéMON.$"
data/maps/PewterCity_Gym/text.inc
+2 -2
View File
@@ -23,9 +23,9 @@ PewterCity_Gym_Text_BrockDefeat::
.string "As proof of your victory, I confer\n" .string "As proof of your victory, I confer\n"
.string "on you this…the official POKéMON\l" .string "on you this…the official POKéMON\l"
.string "LEAGUE BOULDERBADGE.\p" .string "LEAGUE BOULDERBADGE.\p"
.string "{SIZE}Á{PLAYER} received the BOULDERBADGE\n" .string "{FONT_2}{PLAYER} received the BOULDERBADGE\n"
.string "from BROCK!{PAUSE_MUSIC}{PLAY_BGM}{MUS_OBTAIN_BADGE}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}\p" .string "from BROCK!{PAUSE_MUSIC}{PLAY_BGM}{MUS_OBTAIN_BADGE}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}\p"
.string "{SIZE}ÇJust having the BOULDERBADGE makes\n" .string "{FONT_4}Just having the BOULDERBADGE makes\n"
.string "your POKéMON more powerful.\p" .string "your POKéMON more powerful.\p"
.string "It also enables the use of the\n" .string "It also enables the use of the\n"
.string "move FLASH outside of battle.\p" .string "move FLASH outside of battle.\p"
data/maps/PewterCity_House1/scripts.inc
+1 -1
View File
@@ -26,7 +26,7 @@ PewterCity_House1_EventScript_Nidoran::
PewterCity_House1_EventScript_DoNidoranCry:: PewterCity_House1_EventScript_DoNidoranCry::
textcolor 3 textcolor 3
waitse waitse
playmoncry SPECIES_NIDORAN_M, 0 playmoncry SPECIES_NIDORAN_M, CRY_MODE_NORMAL
msgbox PewterCity_House1_Text_Nidoran msgbox PewterCity_House1_Text_Nidoran
waitmoncry waitmoncry
call EventScript_RestorePrevTextColor call EventScript_RestorePrevTextColor
data/maps/PokemonTower_6F/scripts.inc
+1 -1
View File
@@ -21,7 +21,7 @@ PokemonTower_6F_EventScript_DefeatedMarowakGhost::
message PokemonTower_6F_Text_GhostWasCubonesMother message PokemonTower_6F_Text_GhostWasCubonesMother
waitmessage waitmessage
waitse waitse
playmoncry SPECIES_MAROWAK, 0 playmoncry SPECIES_MAROWAK, CRY_MODE_NORMAL
waitbuttonpress waitbuttonpress
waitmoncry waitmoncry
msgbox PokemonTower_6F_Text_MothersSpiritWasCalmed msgbox PokemonTower_6F_Text_MothersSpiritWasCalmed
data/maps/PowerPlant/scripts.inc
+3 -3
View File
@@ -40,7 +40,7 @@ PowerPlant_EventScript_Zapdos::
faceplayer faceplayer
setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE
waitse waitse
playmoncry SPECIES_ZAPDOS, 2 playmoncry SPECIES_ZAPDOS, CRY_MODE_ENCOUNTER
message Text_Gyaoo message Text_Gyaoo
waitmessage waitmessage
waitmoncry waitmoncry
@@ -78,7 +78,7 @@ PowerPlant_EventScript_Electrode1::
faceplayer faceplayer
setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE
waitse waitse
playmoncry SPECIES_ELECTRODE, 2 playmoncry SPECIES_ELECTRODE, CRY_MODE_ENCOUNTER
delay 40 delay 40
waitmoncry waitmoncry
setflag FLAG_SYS_SPECIAL_WILD_BATTLE setflag FLAG_SYS_SPECIAL_WILD_BATTLE
@@ -107,7 +107,7 @@ PowerPlant_EventScript_Electrode2::
faceplayer faceplayer
setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE
waitse waitse
playmoncry SPECIES_ELECTRODE, 2 playmoncry SPECIES_ELECTRODE, CRY_MODE_ENCOUNTER
delay 40 delay 40
waitmoncry waitmoncry
setflag FLAG_SYS_SPECIAL_WILD_BATTLE setflag FLAG_SYS_SPECIAL_WILD_BATTLE
data/maps/Route12/scripts.inc
+1 -1
View File
@@ -22,7 +22,7 @@ Route12_EventScript_Snorlax::
call EventScript_AwakenSnorlax call EventScript_AwakenSnorlax
setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
waitse waitse
playmoncry SPECIES_SNORLAX, 2 playmoncry SPECIES_SNORLAX, CRY_MODE_ENCOUNTER
delay 40 delay 40
waitmoncry waitmoncry
setflag FLAG_HIDE_ROUTE_12_SNORLAX setflag FLAG_HIDE_ROUTE_12_SNORLAX
data/maps/Route16/scripts.inc
+1 -1
View File
@@ -41,7 +41,7 @@ Route16_EventScript_Snorlax::
call EventScript_AwakenSnorlax call EventScript_AwakenSnorlax
setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
waitse waitse
playmoncry SPECIES_SNORLAX, 2 playmoncry SPECIES_SNORLAX, CRY_MODE_ENCOUNTER
delay 40 delay 40
waitmoncry waitmoncry
setflag FLAG_HIDE_ROUTE_16_SNORLAX setflag FLAG_HIDE_ROUTE_16_SNORLAX
data/maps/Route16_House/scripts.inc
+1 -1
View File
@@ -29,7 +29,7 @@ Route16_House_EventScript_Fearow::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_FEAROW, 0 playmoncry SPECIES_FEAROW, CRY_MODE_NORMAL
msgbox Route16_House_Text_Fearow msgbox Route16_House_Text_Fearow
waitmoncry waitmoncry
release release
data/maps/SSAnne_1F_Room3/scripts.inc
+1 -1
View File
@@ -13,7 +13,7 @@ SSAnne_1F_Room3_EventScript_Wigglytuff::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_WIGGLYTUFF, 0 playmoncry SPECIES_WIGGLYTUFF, CRY_MODE_NORMAL
msgbox SSAnne_1F_Room3_Text_Wigglytuff msgbox SSAnne_1F_Room3_Text_Wigglytuff
waitmoncry waitmoncry
release release
data/maps/SSAnne_B1F_Room5/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ SSAnne_B1F_Room5_EventScript_Machoke::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_MACHOKE, 0 playmoncry SPECIES_MACHOKE, CRY_MODE_NORMAL
msgbox SSAnne_B1F_Room5_Text_Machoke msgbox SSAnne_B1F_Room5_Text_Machoke
waitmoncry waitmoncry
release release
data/maps/SaffronCity/scripts.inc
+1 -1
View File
@@ -76,7 +76,7 @@ SaffronCity_EventScript_Pidgeot::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_PIDGEOT, 0 playmoncry SPECIES_PIDGEOT, CRY_MODE_NORMAL
msgbox SaffronCity_Text_Pidgeot msgbox SaffronCity_Text_Pidgeot
waitmoncry waitmoncry
release release
data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc
+1 -1
View File
@@ -13,7 +13,7 @@ SaffronCity_CopycatsHouse_1F_EventScript_Chansey::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_CHANSEY, 0 playmoncry SPECIES_CHANSEY, CRY_MODE_NORMAL
msgbox SaffronCity_CopycatsHouse_1F_Text_Chansey msgbox SaffronCity_CopycatsHouse_1F_Text_Chansey
waitmoncry waitmoncry
release release
data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ SaffronCity_CopycatsHouse_2F_EventScript_Doduo::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_DODUO, 0 playmoncry SPECIES_DODUO, CRY_MODE_NORMAL
msgbox SaffronCity_CopycatsHouse_2F_Text_Doduo msgbox SaffronCity_CopycatsHouse_2F_Text_Doduo
waitmoncry waitmoncry
release release
data/maps/SaffronCity_House/scripts.inc
+1 -1
View File
@@ -13,7 +13,7 @@ SaffronCity_House_EventScript_Pidgey::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_PIDGEY, 0 playmoncry SPECIES_PIDGEY, CRY_MODE_NORMAL
msgbox SaffronCity_House_Text_Pidgey msgbox SaffronCity_House_Text_Pidgey
waitmoncry waitmoncry
release release
data/maps/SeafoamIslands_B4F/scripts.inc
+1 -1
View File
@@ -164,7 +164,7 @@ SeafoamIslands_B4F_EventScript_Articuno::
faceplayer faceplayer
setwildbattle SPECIES_ARTICUNO, 50, ITEM_NONE setwildbattle SPECIES_ARTICUNO, 50, ITEM_NONE
waitse waitse
playmoncry SPECIES_ARTICUNO, 2 playmoncry SPECIES_ARTICUNO, CRY_MODE_ENCOUNTER
message Text_Gyaoo message Text_Gyaoo
waitmessage waitmessage
waitmoncry waitmoncry
data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
+1 -1
View File
@@ -76,7 +76,7 @@ SevenIsland_SevaultCanyon_House_EventScript_Chansey::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_CHANSEY, 0 playmoncry SPECIES_CHANSEY, CRY_MODE_NORMAL
msgbox SevenIsland_SevaultCanyon_House_Text_Chansey msgbox SevenIsland_SevaultCanyon_House_Text_Chansey
waitmoncry waitmoncry
release release
data/maps/ThreeIsland/scripts.inc
+1 -1
View File
@@ -404,7 +404,7 @@ ThreeIsland_EventScript_Doduo::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_DODUO, 0 playmoncry SPECIES_DODUO, CRY_MODE_NORMAL
msgbox ThreeIsland_Text_Doduo msgbox ThreeIsland_Text_Doduo
waitmoncry waitmoncry
release release
data/maps/ThreeIsland_BerryForest/scripts.inc
+1 -1
View File
@@ -21,7 +21,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle::
msgbox ThreeIsland_BerryForest_Text_HereItComesAgain msgbox ThreeIsland_BerryForest_Text_HereItComesAgain
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
waitse waitse
playmoncry SPECIES_HYPNO, 2 playmoncry SPECIES_HYPNO, CRY_MODE_ENCOUNTER
waitmoncry waitmoncry
setwildbattle SPECIES_HYPNO, 30, ITEM_NONE setwildbattle SPECIES_HYPNO, 30, ITEM_NONE
dowildbattle dowildbattle
data/maps/VermilionCity/scripts.inc
+1 -1
View File
@@ -249,7 +249,7 @@ VermilionCity_EventScript_Machop::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_MACHOP, 0 playmoncry SPECIES_MACHOP, CRY_MODE_NORMAL
msgbox VermilionCity_Text_Machop msgbox VermilionCity_Text_Machop
waitmoncry waitmoncry
msgbox VermilionCity_Text_MachopStompingLandFlat msgbox VermilionCity_Text_MachopStompingLandFlat
data/maps/VermilionCity/text.inc
+4 -4
View File
@@ -61,14 +61,14 @@ VermilionCity_Text_DoYouHaveATicket::
.string "Excuse me, do you have a ticket?$" .string "Excuse me, do you have a ticket?$"
VermilionCity_Text_FlashedSSTicket:: VermilionCity_Text_FlashedSSTicket::
.string "{SIZE}Á{PLAYER} flashed the S.S. TICKET!\p" .string "{FONT_2}{PLAYER} flashed the S.S. TICKET!\p"
.string "{SIZE}ÇGreat!\n" .string "{FONT_4}Great!\n"
.string "Welcome to the S.S. ANNE!$" .string "Welcome to the S.S. ANNE!$"
VermilionCity_Text_DontHaveNeededSSTicket:: VermilionCity_Text_DontHaveNeededSSTicket::
.string "{SIZE}Á{PLAYER} doesn't have the needed\n" .string "{FONT_2}{PLAYER} doesn't have the needed\n"
.string "S.S. TICKET.\p" .string "S.S. TICKET.\p"
.string "{SIZE}ÇSorry!\p" .string "{FONT_4}Sorry!\p"
.string "You need a ticket to get aboard.$" .string "You need a ticket to get aboard.$"
VermilionCity_Text_TheShipSetSail:: VermilionCity_Text_TheShipSetSail::
data/maps/VermilionCity_House3/scripts.inc
+1 -1
View File
@@ -13,7 +13,7 @@ VermilionCity_House3_EventScript_Pidgey::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_PIDGEY, 0 playmoncry SPECIES_PIDGEY, CRY_MODE_NORMAL
msgbox VermilionCity_House3_Text_Pidgey msgbox VermilionCity_House3_Text_Pidgey
waitmoncry waitmoncry
release release
data/maps/VermilionCity_PokemonFanClub/scripts.inc
+2 -2
View File
@@ -99,7 +99,7 @@ VermilionCity_PokemonFanClub_EventScript_Pikachu::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_PIKACHU, 0 playmoncry SPECIES_PIKACHU, CRY_MODE_NORMAL
msgbox VermilionCity_PokemonFanClub_Text_Pikachu msgbox VermilionCity_PokemonFanClub_Text_Pikachu
waitmoncry waitmoncry
release release
@@ -109,7 +109,7 @@ VermilionCity_PokemonFanClub_EventScript_Seel::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_SEEL, 0 playmoncry SPECIES_SEEL, CRY_MODE_NORMAL
msgbox VermilionCity_PokemonFanClub_Text_Seel msgbox VermilionCity_PokemonFanClub_Text_Seel
waitmoncry waitmoncry
release release
data/maps/ViridianCity_House1/scripts.inc
+1 -1
View File
@@ -13,7 +13,7 @@ ViridianCity_House1_EventScript_Speary::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_SPEAROW, 0 playmoncry SPECIES_SPEAROW, CRY_MODE_NORMAL
msgbox ViridianCity_House1_Text_Speary msgbox ViridianCity_House1_Text_Speary
waitmoncry waitmoncry
release release
data/scripts/day_care.inc
+2 -2
View File
@@ -31,7 +31,7 @@ Route5_PokemonDayCare_EventScript_TryGiveMon::
specialvar VAR_0x8005, GetSelectedMonNicknameAndSpecies specialvar VAR_0x8005, GetSelectedMonNicknameAndSpecies
msgbox Route5_PokemonDayCare_Text_LookAfterMonForAWhile msgbox Route5_PokemonDayCare_Text_LookAfterMonForAWhile
waitse waitse
playmoncry VAR_0x8005, 0 playmoncry VAR_0x8005, CRY_MODE_NORMAL
msgbox Route5_PokemonDayCare_Text_ComeSeeMeInAWhile msgbox Route5_PokemonDayCare_Text_ComeSeeMeInAWhile
waitmoncry waitmoncry
special PutMonInRoute5Daycare special PutMonInRoute5Daycare
@@ -100,7 +100,7 @@ Route5_PokemonDayCare_EventScript_RetrieveMon::
msgbox Route5_PokemonDayCare_Text_ThankYouHeresMon msgbox Route5_PokemonDayCare_Text_ThankYouHeresMon
textcolor 3 textcolor 3
waitse waitse
playmoncry VAR_RESULT, 0 playmoncry VAR_RESULT, CRY_MODE_NORMAL
msgbox Route5_PokemonDayCare_Text_PlayerGotMonBack msgbox Route5_PokemonDayCare_Text_PlayerGotMonBack
call EventScript_RestorePrevTextColor call EventScript_RestorePrevTextColor
waitmoncry waitmoncry
data/text/fame_checker.inc
+86 -86
View File
@@ -4,13 +4,13 @@ gFameCheckerFlavorText_ProfOak0:: @ 0x81AD106
gFameCheckerFlavorText_ProfOak1:: @ 0x81AD145 gFameCheckerFlavorText_ProfOak1:: @ 0x81AD145
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}To make a complete guide on all\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}To make a complete guide on all\n"
.string "the POKéMON in the world…\p" .string "the POKéMON in the world…\p"
.string "That was my dream!$" .string "That was my dream!$"
gFameCheckerFlavorText_ProfOak2:: @ 0x81AD1BB gFameCheckerFlavorText_ProfOak2:: @ 0x81AD1BB
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}PROF. OAK may not look like much,\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}PROF. OAK may not look like much,\n"
.string "but he's the authority on POKéMON.\p" .string "but he's the authority on POKéMON.\p"
.string "Many POKéMON TRAINERS hold him in\n" .string "Many POKéMON TRAINERS hold him in\n"
.string "high regard.$" .string "high regard.$"
@@ -22,7 +22,7 @@ gFameCheckerFlavorText_ProfOak3:: @ 0x81AD258
gFameCheckerFlavorText_ProfOak4:: @ 0x81AD2B9 gFameCheckerFlavorText_ProfOak4:: @ 0x81AD2B9
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear OAK's taken a lot of\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear OAK's taken a lot of\n"
.string "interest in you, child.\p" .string "interest in you, child.\p"
.string "That old duff was once tough and\n" .string "That old duff was once tough and\n"
.string "handsome.\p" .string "handsome.\p"
@@ -31,26 +31,26 @@ gFameCheckerFlavorText_ProfOak4:: @ 0x81AD2B9
gFameCheckerFlavorText_ProfOak5:: @ 0x81AD377 gFameCheckerFlavorText_ProfOak5:: @ 0x81AD377
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}PROF. OAK is going to have his own\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}PROF. OAK is going to have his own\n"
.string "radio show soon.\p" .string "radio show soon.\p"
.string "The program will be called PROF.\n" .string "The program will be called PROF.\n"
.string "OAK'S POKéMON SEMINAR.$" .string "OAK'S POKéMON SEMINAR.$"
gFameCheckerFlavorText_Daisy0:: @ 0x81AD40C gFameCheckerFlavorText_Daisy0:: @ 0x81AD40C
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}If you show DAISY your POKéMON,\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}If you show DAISY your POKéMON,\n"
.string "she can tell how much it likes you.\p" .string "she can tell how much it likes you.\p"
.string "Occasionally, she will even groom\n" .string "Occasionally, she will even groom\n"
.string "a POKéMON for you.$" .string "a POKéMON for you.$"
gFameCheckerFlavorText_Daisy1:: @ 0x81AD4AE gFameCheckerFlavorText_Daisy1:: @ 0x81AD4AE
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}But the person who is most liked by\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}But the person who is most liked by\n"
.string "POKéMON is DAISY, I think.$" .string "POKéMON is DAISY, I think.$"
gFameCheckerFlavorText_Daisy2:: @ 0x81AD516 gFameCheckerFlavorText_Daisy2:: @ 0x81AD516
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}She was gently grooming POKéMON…\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}She was gently grooming POKéMON…\n"
.string "She was a little angel.\p" .string "She was a little angel.\p"
.string "That little girl's name…\n" .string "That little girl's name…\n"
.string "I think it was DAISY.$" .string "I think it was DAISY.$"
@@ -62,7 +62,7 @@ gFameCheckerFlavorText_Daisy3:: @ 0x81AD5A7
gFameCheckerFlavorText_Daisy4:: @ 0x81AD608 gFameCheckerFlavorText_Daisy4:: @ 0x81AD608
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}A girl from PALLET TOWN, DAISY,\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}A girl from PALLET TOWN, DAISY,\n"
.string "she enjoys TEA every day.\p" .string "she enjoys TEA every day.\p"
.string "She visits the CELADON DEPT. STORE\n" .string "She visits the CELADON DEPT. STORE\n"
.string "to buy some TEA.$" .string "to buy some TEA.$"
@@ -81,7 +81,7 @@ gFameCheckerFlavorText_Brock0:: @ 0x81AD705
gFameCheckerFlavorText_Brock1:: @ 0x81AD771 gFameCheckerFlavorText_Brock1:: @ 0x81AD771
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My rock-hard willpower is evident\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My rock-hard willpower is evident\n"
.string "in even my POKéMON.\p" .string "in even my POKéMON.\p"
.string "My POKéMON are all rock hard and\n" .string "My POKéMON are all rock hard and\n"
.string "have true-grit determination.\p" .string "have true-grit determination.\p"
@@ -90,7 +90,7 @@ gFameCheckerFlavorText_Brock1:: @ 0x81AD771
gFameCheckerFlavorText_Brock2:: @ 0x81AD840 gFameCheckerFlavorText_Brock2:: @ 0x81AD840
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}There aren't many serious POKéMON\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}There aren't many serious POKéMON\n"
.string "TRAINERS here.\p" .string "TRAINERS here.\p"
.string "They're all like BUG CATCHERS,\n" .string "They're all like BUG CATCHERS,\n"
.string "you know, just hobbyists.\p" .string "you know, just hobbyists.\p"
@@ -99,14 +99,14 @@ gFameCheckerFlavorText_Brock2:: @ 0x81AD840
gFameCheckerFlavorText_Brock3:: @ 0x81AD908 gFameCheckerFlavorText_Brock3:: @ 0x81AD908
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BROCK is cool. He's not just tough.\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BROCK is cool. He's not just tough.\n"
.string "People like and respect him.\p" .string "People like and respect him.\p"
.string "I want to become a GYM LEADER\n" .string "I want to become a GYM LEADER\n"
.string "like him.$" .string "like him.$"
gFameCheckerFlavorText_Brock4:: @ 0x81AD99A gFameCheckerFlavorText_Brock4:: @ 0x81AD99A
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hi, I'm excavating for fossils here\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hi, I'm excavating for fossils here\n"
.string "under MT. MOON.\p" .string "under MT. MOON.\p"
.string "Sometimes, BROCK of PEWTER GYM\n" .string "Sometimes, BROCK of PEWTER GYM\n"
.string "lends me a hand.$" .string "lends me a hand.$"
@@ -124,25 +124,25 @@ gFameCheckerFlavorText_Misty0:: @ 0x81ADA91
gFameCheckerFlavorText_Misty1:: @ 0x81ADAF6 gFameCheckerFlavorText_Misty1:: @ 0x81ADAF6
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My policy is an all-out offensive\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My policy is an all-out offensive\n"
.string "with WATER-type POKéMON!$" .string "with WATER-type POKéMON!$"
gFameCheckerFlavorText_Misty2:: @ 0x81ADB5A gFameCheckerFlavorText_Misty2:: @ 0x81ADB5A
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}MISTY is a TRAINER who's going to\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}MISTY is a TRAINER who's going to\n"
.string "keep improving.\p" .string "keep improving.\p"
.string "She won't lose to someone like you!$" .string "She won't lose to someone like you!$"
gFameCheckerFlavorText_Misty3:: @ 0x81ADBD9 gFameCheckerFlavorText_Misty3:: @ 0x81ADBD9
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Strong TRAINERS and WATER POKéMON\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Strong TRAINERS and WATER POKéMON\n"
.string "are common sights in these parts.\p" .string "are common sights in these parts.\p"
.string "They say that MISTY of the\n" .string "They say that MISTY of the\n"
.string "CERULEAN GYM trains here.$" .string "CERULEAN GYM trains here.$"
gFameCheckerFlavorText_Misty4:: @ 0x81ADC72 gFameCheckerFlavorText_Misty4:: @ 0x81ADC72
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}This cape is a famous date spot.\p" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}This cape is a famous date spot.\p"
.string "MISTY, the GYM LEADER, has high\n" .string "MISTY, the GYM LEADER, has high\n"
.string "hopes about this place.$" .string "hopes about this place.$"
@@ -159,23 +159,23 @@ gFameCheckerFlavorText_LtSurge0:: @ 0x81ADD3C
gFameCheckerFlavorText_LtSurge1:: @ 0x81ADDA7 gFameCheckerFlavorText_LtSurge1:: @ 0x81ADDA7
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I tell you, kid, electric POKéMON\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I tell you, kid, electric POKéMON\n"
.string "saved me during the war!$" .string "saved me during the war!$"
gFameCheckerFlavorText_LtSurge2:: @ 0x81ADE0B gFameCheckerFlavorText_LtSurge2:: @ 0x81ADE0B
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}When I was in the Army, LT. SURGE\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}When I was in the Army, LT. SURGE\n"
.string "was my strict CO.\p" .string "was my strict CO.\p"
.string "He was a hard taskmaster.$" .string "He was a hard taskmaster.$"
gFameCheckerFlavorText_LtSurge3:: @ 0x81ADE82 gFameCheckerFlavorText_LtSurge3:: @ 0x81ADE82
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}LT. SURGE was always famous for\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}LT. SURGE was always famous for\n"
.string "his cautious nature in the Army.$" .string "his cautious nature in the Army.$"
gFameCheckerFlavorText_LtSurge4:: @ 0x81ADEEC gFameCheckerFlavorText_LtSurge4:: @ 0x81ADEEC
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}LT. SURGE installed the traps in\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}LT. SURGE installed the traps in\n"
.string "the GYM himself.\p" .string "the GYM himself.\p"
.string "He set up double locks everywhere.$" .string "He set up double locks everywhere.$"
@@ -194,26 +194,26 @@ gFameCheckerFlavorText_Erika0:: @ 0x81AE009
gFameCheckerFlavorText_Erika1:: @ 0x81AE072 gFameCheckerFlavorText_Erika1:: @ 0x81AE072
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am a student of the art of\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am a student of the art of\n"
.string "flower arranging.\p" .string "flower arranging.\p"
.string "My POKéMON are solely of the\n" .string "My POKéMON are solely of the\n"
.string "GRASS type.$" .string "GRASS type.$"
gFameCheckerFlavorText_Erika2:: @ 0x81AE0F3 gFameCheckerFlavorText_Erika2:: @ 0x81AE0F3
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Our LEADER ERIKA might be quiet,\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Our LEADER ERIKA might be quiet,\n"
.string "but she's famous around here.$" .string "but she's famous around here.$"
gFameCheckerFlavorText_Erika3:: @ 0x81AE15B gFameCheckerFlavorText_Erika3:: @ 0x81AE15B
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We only use GRASS-type POKéMON at\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We only use GRASS-type POKéMON at\n"
.string "our GYM.\p" .string "our GYM.\p"
.string "Why? We also use them for making\n" .string "Why? We also use them for making\n"
.string "flower arrangements!$" .string "flower arrangements!$"
gFameCheckerFlavorText_Erika4:: @ 0x81AE1E5 gFameCheckerFlavorText_Erika4:: @ 0x81AE1E5
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I would never collect POKéMON if\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I would never collect POKéMON if\n"
.string "they were unattractive.$" .string "they were unattractive.$"
gFameCheckerFlavorText_Erika5:: @ 0x81AE247 gFameCheckerFlavorText_Erika5:: @ 0x81AE247
@@ -230,18 +230,18 @@ gFameCheckerFlavorText_Koga0:: @ 0x81AE2B6
gFameCheckerFlavorText_Koga1:: @ 0x81AE31D gFameCheckerFlavorText_Koga1:: @ 0x81AE31D
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Despair to the creeping horror of\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Despair to the creeping horror of\n"
.string "POISON-type POKéMON!$" .string "POISON-type POKéMON!$"
gFameCheckerFlavorText_Koga2:: @ 0x81AE37D gFameCheckerFlavorText_Koga2:: @ 0x81AE37D
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Even though I've lost, I will keep\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Even though I've lost, I will keep\n"
.string "training according to the teachings\l" .string "training according to the teachings\l"
.string "of KOGA, my ninja master.$" .string "of KOGA, my ninja master.$"
gFameCheckerFlavorText_Koga3:: @ 0x81AE407 gFameCheckerFlavorText_Koga3:: @ 0x81AE407
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My father is the GYM LEADER of\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My father is the GYM LEADER of\n"
.string "this town.\p" .string "this town.\p"
.string "I'm training to use POISON POKéMON\n" .string "I'm training to use POISON POKéMON\n"
.string "as well as my father.$" .string "as well as my father.$"
@@ -255,7 +255,7 @@ gFameCheckerFlavorText_Koga4:: @ 0x81AE48D
gFameCheckerFlavorText_Koga5:: @ 0x81AE51B gFameCheckerFlavorText_Koga5:: @ 0x81AE51B
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The SAFARI ZONE's huge, wouldn't\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The SAFARI ZONE's huge, wouldn't\n"
.string "you say?\p" .string "you say?\p"
.string "FUCHSIA's GYM LEADER, KOGA, \n" .string "FUCHSIA's GYM LEADER, KOGA, \n"
.string "patrols the grounds every so often.\p" .string "patrols the grounds every so often.\p"
@@ -270,21 +270,21 @@ gFameCheckerFlavorText_Sabrina0:: @ 0x81AE5E8
gFameCheckerFlavorText_Sabrina1:: @ 0x81AE656 gFameCheckerFlavorText_Sabrina1:: @ 0x81AE656
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You know about a girl GYM LEADER\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You know about a girl GYM LEADER\n"
.string "in SAFFRON CITY?\p" .string "in SAFFRON CITY?\p"
.string "She uses PSYCHIC-type POKéMON,\n" .string "She uses PSYCHIC-type POKéMON,\n"
.string "right?$" .string "right?$"
gFameCheckerFlavorText_Sabrina2:: @ 0x81AE6D7 gFameCheckerFlavorText_Sabrina2:: @ 0x81AE6D7
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I have had psychic powers since\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I have had psychic powers since\n"
.string "I was a child.\p" .string "I was a child.\p"
.string "It started when a spoon I\n" .string "It started when a spoon I\n"
.string "carelessly tossed, bent.$" .string "carelessly tossed, bent.$"
gFameCheckerFlavorText_Sabrina3:: @ 0x81AE762 gFameCheckerFlavorText_Sabrina3:: @ 0x81AE762
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I dislike battling, but if you wish,\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I dislike battling, but if you wish,\n"
.string "I will show you my powers!$" .string "I will show you my powers!$"
gFameCheckerFlavorText_Sabrina4:: @ 0x81AE7CB gFameCheckerFlavorText_Sabrina4:: @ 0x81AE7CB
@@ -295,7 +295,7 @@ gFameCheckerFlavorText_Sabrina4:: @ 0x81AE7CB
gFameCheckerFlavorText_Sabrina5:: @ 0x81AE841 gFameCheckerFlavorText_Sabrina5:: @ 0x81AE841
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}SABRINA just wiped out the KARATE\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}SABRINA just wiped out the KARATE\n"
.string "MASTER next door.$" .string "MASTER next door.$"
gFameCheckerFlavorText_Blaine0:: @ 0x81AE89E gFameCheckerFlavorText_Blaine0:: @ 0x81AE89E
@@ -306,13 +306,13 @@ gFameCheckerFlavorText_Blaine0:: @ 0x81AE89E
gFameCheckerFlavorText_Blaine1:: @ 0x81AE90A gFameCheckerFlavorText_Blaine1:: @ 0x81AE90A
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My fiery POKéMON are all rough\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My fiery POKéMON are all rough\n"
.string "and ready with intense heat!\p" .string "and ready with intense heat!\p"
.string "They incinerate all challengers!$" .string "They incinerate all challengers!$"
gFameCheckerFlavorText_Blaine2:: @ 0x81AE990 gFameCheckerFlavorText_Blaine2:: @ 0x81AE990
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Our LEADER, BLAINE, became lost\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Our LEADER, BLAINE, became lost\n"
.string "in the mountains but good.\p" .string "in the mountains but good.\p"
.string "Night fell when a fiery bird\n" .string "Night fell when a fiery bird\n"
.string "POKéMON appeared.\p" .string "POKéMON appeared.\p"
@@ -321,7 +321,7 @@ gFameCheckerFlavorText_Blaine2:: @ 0x81AE990
gFameCheckerFlavorText_Blaine3:: @ 0x81AEA59 gFameCheckerFlavorText_Blaine3:: @ 0x81AEA59
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}CINNABAR GYM's BLAINE is quite the\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}CINNABAR GYM's BLAINE is quite the\n"
.string "odd fellow.\p" .string "odd fellow.\p"
.string "He's lived on the island since way\n" .string "He's lived on the island since way\n"
.string "before the LAB was built.$" .string "before the LAB was built.$"
@@ -341,16 +341,16 @@ gFameCheckerFlavorText_Blaine5:: @ 0x81AEB69
gFameCheckerFlavorText_Lorelei0:: @ 0x81AEBDF gFameCheckerFlavorText_Lorelei0:: @ 0x81AEBDF
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am LORELEI of the ELITE FOUR.$" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am LORELEI of the ELITE FOUR.$"
gFameCheckerFlavorText_Lorelei1:: @ 0x81AEC28 gFameCheckerFlavorText_Lorelei1:: @ 0x81AEC28
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}No one can best me when it comes\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}No one can best me when it comes\n"
.string "to icy POKéMON.$" .string "to icy POKéMON.$"
gFameCheckerFlavorText_Lorelei2:: @ 0x81AEC82 gFameCheckerFlavorText_Lorelei2:: @ 0x81AEC82
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Where was this person born?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Where was this person born?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We've had a great and powerful\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We've had a great and powerful\n"
.string "TRAINER grow up on this island.\p" .string "TRAINER grow up on this island.\p"
.string "I bet even you'd know her.\n" .string "I bet even you'd know her.\n"
.string "It's LORELEI of the ELITE FOUR!$" .string "It's LORELEI of the ELITE FOUR!$"
@@ -363,14 +363,14 @@ gFameCheckerFlavorText_Lorelei3:: @ 0x81AED27
gFameCheckerFlavorText_Lorelei4:: @ 0x81AEDAA gFameCheckerFlavorText_Lorelei4:: @ 0x81AEDAA
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Did you know that LORELEI has lots\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Did you know that LORELEI has lots\n"
.string "and lots of stuffed dolls?\p" .string "and lots of stuffed dolls?\p"
.string "Every time she comes back to\n" .string "Every time she comes back to\n"
.string "FOUR ISLAND, her collection grows!$" .string "FOUR ISLAND, her collection grows!$"
gFameCheckerFlavorText_Lorelei5:: @ 0x81AEE51 gFameCheckerFlavorText_Lorelei5:: @ 0x81AEE51
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The LAPRAS she has, I imagine it\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The LAPRAS she has, I imagine it\n"
.string "to be the one she met as a child.\p" .string "to be the one she met as a child.\p"
.string "I believe it was in ICEFALL CAVE\n" .string "I believe it was in ICEFALL CAVE\n"
.string "that she caught it.\p" .string "that she caught it.\p"
@@ -379,11 +379,11 @@ gFameCheckerFlavorText_Lorelei5:: @ 0x81AEE51
gFameCheckerFlavorText_Bruno0:: @ 0x81AEF25 gFameCheckerFlavorText_Bruno0:: @ 0x81AEF25
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am BRUNO of the ELITE FOUR!$" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am BRUNO of the ELITE FOUR!$"
gFameCheckerFlavorText_Bruno1:: @ 0x81AEF6C gFameCheckerFlavorText_Bruno1:: @ 0x81AEF6C
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I've lived and trained with my\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I've lived and trained with my\n"
.string "fighting POKéMON!$" .string "fighting POKéMON!$"
gFameCheckerFlavorText_Bruno2:: @ 0x81AEFC6 gFameCheckerFlavorText_Bruno2:: @ 0x81AEFC6
@@ -394,14 +394,14 @@ gFameCheckerFlavorText_Bruno2:: @ 0x81AEFC6
gFameCheckerFlavorText_Bruno3:: @ 0x81AF04C gFameCheckerFlavorText_Bruno3:: @ 0x81AF04C
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BRUNO, who's a senior ahead of me,\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BRUNO, who's a senior ahead of me,\n"
.string "visits the SPA on occasion.\p" .string "visits the SPA on occasion.\p"
.string "He comes to rehab injuries, both\n" .string "He comes to rehab injuries, both\n"
.string "his own and his POKéMON's.$" .string "his own and his POKéMON's.$"
gFameCheckerFlavorText_Bruno4:: @ 0x81AF0F0 gFameCheckerFlavorText_Bruno4:: @ 0x81AF0F0
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's one of the ELITE FOUR.\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's one of the ELITE FOUR.\n"
.string "His name is BRUNO.\p" .string "His name is BRUNO.\p"
.string "He went away disappointed when he\n" .string "He went away disappointed when he\n"
.string "found out that they were all sold\l" .string "found out that they were all sold\l"
@@ -409,22 +409,22 @@ gFameCheckerFlavorText_Bruno4:: @ 0x81AF0F0
gFameCheckerFlavorText_Bruno5:: @ 0x81AF19A gFameCheckerFlavorText_Bruno5:: @ 0x81AF19A
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Even BRUNO…\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Even BRUNO…\n"
.string "He trained with a fellow by the\l" .string "He trained with a fellow by the\l"
.string "name of BRAWLY before.$" .string "name of BRAWLY before.$"
gFameCheckerFlavorText_Agatha0:: @ 0x81AF200 gFameCheckerFlavorText_Agatha0:: @ 0x81AF200
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am AGATHA of the ELITE FOUR.$" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am AGATHA of the ELITE FOUR.$"
gFameCheckerFlavorText_Agatha1:: @ 0x81AF248 gFameCheckerFlavorText_Agatha1:: @ 0x81AF248
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}AGATHA's GHOST-type POKéMON are\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}AGATHA's GHOST-type POKéMON are\n"
.string "horrifically terrifying in toughness.$" .string "horrifically terrifying in toughness.$"
gFameCheckerFlavorText_Agatha2:: @ 0x81AF2B7 gFameCheckerFlavorText_Agatha2:: @ 0x81AF2B7
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}That old lady's also got a really\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}That old lady's also got a really\n"
.string "short fuse, too.\p" .string "short fuse, too.\p"
.string "It doesn't take anything to get\n" .string "It doesn't take anything to get\n"
.string "that scary lady hollering.$" .string "that scary lady hollering.$"
@@ -437,7 +437,7 @@ gFameCheckerFlavorText_Agatha3:: @ 0x81AF34E
gFameCheckerFlavorText_Agatha4:: @ 0x81AF3BE gFameCheckerFlavorText_Agatha4:: @ 0x81AF3BE
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear OAK's taken a lot of\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear OAK's taken a lot of\n"
.string "interest in you, child.\p" .string "interest in you, child.\p"
.string "That old duff was once tough and\n" .string "That old duff was once tough and\n"
.string "handsome.\p" .string "handsome.\p"
@@ -446,19 +446,19 @@ gFameCheckerFlavorText_Agatha4:: @ 0x81AF3BE
gFameCheckerFlavorText_Agatha5:: @ 0x81AF47C gFameCheckerFlavorText_Agatha5:: @ 0x81AF47C
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Take AGATHA, for example.\p" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Take AGATHA, for example.\p"
.string "She set a record for being the\n" .string "She set a record for being the\n"
.string "oldest-ever ELITE FOUR member.$" .string "oldest-ever ELITE FOUR member.$"
gFameCheckerFlavorText_Lance0:: @ 0x81AF4FD gFameCheckerFlavorText_Lance0:: @ 0x81AF4FD
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I lead the ELITE FOUR.\p" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I lead the ELITE FOUR.\p"
.string "You can call me LANCE the dragon\n" .string "You can call me LANCE the dragon\n"
.string "TRAINER.$" .string "TRAINER.$"
gFameCheckerFlavorText_Lance1:: @ 0x81AF567 gFameCheckerFlavorText_Lance1:: @ 0x81AF567
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You know that dragons are\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You know that dragons are\n"
.string "mythical POKéMON.\p" .string "mythical POKéMON.\p"
.string "They're hard to catch and raise,\n" .string "They're hard to catch and raise,\n"
.string "but their powers are superior.\p" .string "but their powers are superior.\p"
@@ -467,13 +467,13 @@ gFameCheckerFlavorText_Lance1:: @ 0x81AF567
gFameCheckerFlavorText_Lance2:: @ 0x81AF641 gFameCheckerFlavorText_Lance2:: @ 0x81AF641
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He stands for justice!\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He stands for justice!\n"
.string "He's cool, and yet passionate!\l" .string "He's cool, and yet passionate!\l"
.string "He's the greatest, LANCE!$" .string "He's the greatest, LANCE!$"
gFameCheckerFlavorText_Lance3:: @ 0x81AF6BA gFameCheckerFlavorText_Lance3:: @ 0x81AF6BA
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We have a customer, LANCE, who\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We have a customer, LANCE, who\n"
.string "occasionally comes.\p" .string "occasionally comes.\p"
.string "He always buys capes.\p" .string "He always buys capes.\p"
.string "I wonder… Does he have many\n" .string "I wonder… Does he have many\n"
@@ -487,56 +487,56 @@ gFameCheckerFlavorText_Lance4:: @ 0x81AF758
gFameCheckerFlavorText_Lance5:: @ 0x81AF7CB gFameCheckerFlavorText_Lance5:: @ 0x81AF7CB
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}From what I've heard, LANCE has\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}From what I've heard, LANCE has\n"
.string "a cousin who's a GYM LEADER\l" .string "a cousin who's a GYM LEADER\l"
.string "somewhere far away.$" .string "somewhere far away.$"
gFameCheckerFlavorText_Bill0:: @ 0x81AF83E gFameCheckerFlavorText_Bill0:: @ 0x81AF83E
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}After all, BILL's world-famous as a\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}After all, BILL's world-famous as a\n"
.string "POKéMANIAC.\p" .string "POKéMANIAC.\p"
.string "He invented the POKéMON Storage\n" .string "He invented the POKéMON Storage\n"
.string "System on PC, too.$" .string "System on PC, too.$"
gFameCheckerFlavorText_Bill1:: @ 0x81AF8CA gFameCheckerFlavorText_Bill1:: @ 0x81AF8CA
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL has lots of POKéMON!\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL has lots of POKéMON!\n"
.string "He collects rare ones, too!$" .string "He collects rare ones, too!$"
gFameCheckerFlavorText_Bill2:: @ 0x81AF929 gFameCheckerFlavorText_Bill2:: @ 0x81AF929
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's my grandson!\p" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's my grandson!\p"
.string "He always liked collecting things,\n" .string "He always liked collecting things,\n"
.string "even as a child!$" .string "even as a child!$"
gFameCheckerFlavorText_Bill3:: @ 0x81AF998 gFameCheckerFlavorText_Bill3:: @ 0x81AF998
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL is a POKéMANIAC, so he loves\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL is a POKéMANIAC, so he loves\n"
.string "every kind.\p" .string "every kind.\p"
.string "Apparently, the first one he caught\n" .string "Apparently, the first one he caught\n"
.string "was an ABRA.$" .string "was an ABRA.$"
gFameCheckerFlavorText_Bill4:: @ 0x81AFA20 gFameCheckerFlavorText_Bill4:: @ 0x81AFA20
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL's hometown is GOLDENROD CITY,\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL's hometown is GOLDENROD CITY,\n"
.string "where his folks still live.\p" .string "where his folks still live.\p"
.string "I've heard that it's quite the\n" .string "I've heard that it's quite the\n"
.string "festive, bustling city.$" .string "festive, bustling city.$"
gFameCheckerFlavorText_Bill5:: @ 0x81AFAB9 gFameCheckerFlavorText_Bill5:: @ 0x81AFAB9
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Apparently, BILL simply can't\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Apparently, BILL simply can't\n"
.string "stomach milk at all.$" .string "stomach milk at all.$"
gFameCheckerFlavorText_MrFuji0:: @ 0x81AFB0C gFameCheckerFlavorText_MrFuji0:: @ 0x81AFB0C
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's really kind.\p" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's really kind.\p"
.string "He looks after abandoned and\n" .string "He looks after abandoned and\n"
.string "orphaned POKéMON.$" .string "orphaned POKéMON.$"
gFameCheckerFlavorText_MrFuji1:: @ 0x81AFB76 gFameCheckerFlavorText_MrFuji1:: @ 0x81AFB76
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}This old guy marched right up to\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}This old guy marched right up to\n"
.string "our HIDEOUT.\p" .string "our HIDEOUT.\p"
.string "Then, he starts ranting about how\n" .string "Then, he starts ranting about how\n"
.string "TEAM ROCKET's abusing POKéMON.\p" .string "TEAM ROCKET's abusing POKéMON.\p"
@@ -553,7 +553,7 @@ gFameCheckerFlavorText_MrFuji2:: @ 0x81AFC38
gFameCheckerFlavorText_MrFuji3:: @ 0x81AFCE9 gFameCheckerFlavorText_MrFuji3:: @ 0x81AFCE9
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear that MR. FUJI's not from\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear that MR. FUJI's not from\n"
.string "these parts originally, either.$" .string "these parts originally, either.$"
gFameCheckerFlavorText_MrFuji4:: @ 0x81AFD49 gFameCheckerFlavorText_MrFuji4:: @ 0x81AFD49
@@ -572,7 +572,7 @@ gFameCheckerFlavorText_MrFuji5:: @ 0x81AFDC4
gFameCheckerFlavorText_Giovanni0:: @ 0x81AFE68 gFameCheckerFlavorText_Giovanni0:: @ 0x81AFE68
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}TEAM ROCKET captures POKéMON from\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}TEAM ROCKET captures POKéMON from\n"
.string "around the world.\p" .string "around the world.\p"
.string "They're important tools for keeping\n" .string "They're important tools for keeping\n"
.string "our criminal enterprise going.\p" .string "our criminal enterprise going.\p"
@@ -580,32 +580,32 @@ gFameCheckerFlavorText_Giovanni0:: @ 0x81AFE68
gFameCheckerFlavorText_Giovanni1:: @ 0x81AFF23 gFameCheckerFlavorText_Giovanni1:: @ 0x81AFF23
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Those thugs that took over our\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Those thugs that took over our\n"
.string "building…\p" .string "building…\p"
.string "Their BOSS said he was looking for\n" .string "Their BOSS said he was looking for\n"
.string "strong POKéMON.$" .string "strong POKéMON.$"
gFameCheckerFlavorText_Giovanni2:: @ 0x81AFFA8 gFameCheckerFlavorText_Giovanni2:: @ 0x81AFFA8
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}TEAM ROCKET's BOSS is terribly\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}TEAM ROCKET's BOSS is terribly\n"
.string "cruel!\p" .string "cruel!\p"
.string "To him, POKéMON are just tools to\n" .string "To him, POKéMON are just tools to\n"
.string "be used.$" .string "be used.$"
gFameCheckerFlavorText_Giovanni3:: @ 0x81B0022 gFameCheckerFlavorText_Giovanni3:: @ 0x81B0022
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Welcome to my hideout!\p" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Welcome to my hideout!\p"
.string "It shall be so until I can restore\n" .string "It shall be so until I can restore\n"
.string "TEAM ROCKET to its former glory.$" .string "TEAM ROCKET to its former glory.$"
gFameCheckerFlavorText_Giovanni4:: @ 0x81B00A6 gFameCheckerFlavorText_Giovanni4:: @ 0x81B00A6
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Blow me away! GIOVANNI was the\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Blow me away! GIOVANNI was the\n"
.string "GYM LEADER of VIRIDIAN?$" .string "GYM LEADER of VIRIDIAN?$"
gFameCheckerFlavorText_Giovanni5:: @ 0x81B0106 gFameCheckerFlavorText_Giovanni5:: @ 0x81B0106
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You… You're not GIOVANNI's kid,\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You… You're not GIOVANNI's kid,\n"
.string "are you?\p" .string "are you?\p"
.string "No, that can't be right.\n" .string "No, that can't be right.\n"
.string "GIOVANNI's kid has red hair.$" .string "GIOVANNI's kid has red hair.$"
@@ -617,7 +617,7 @@ gFameCheckerPersonName_ProfOak:: @ 0x81B0188
gFameCheckerPersonQuote_ProfOak:: @ 0x81B0198 gFameCheckerPersonQuote_ProfOak:: @ 0x81B0198
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: PROF. OAK\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: PROF. OAK\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Why do POKéMON compete and battle\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Why do POKéMON compete and battle\n"
.string "so hard for you?\p" .string "so hard for you?\p"
.string "They do so because they can see\n" .string "They do so because they can see\n"
.string "the love and trust you have\l" .string "the love and trust you have\l"
@@ -630,7 +630,7 @@ gFameCheckerPersonName_Daisy:: @ 0x81B0251
gFameCheckerPersonQuote_Daisy:: @ 0x81B025D gFameCheckerPersonQuote_Daisy:: @ 0x81B025D
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: DAISY\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: DAISY\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}While I was comfortably enjoying\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}While I was comfortably enjoying\n"
.string "my tea breaks, you've grown very\l" .string "my tea breaks, you've grown very\l"
.string "skilled and powerful.\p" .string "skilled and powerful.\p"
.string "I hope you'll remain a good rival\n" .string "I hope you'll remain a good rival\n"
@@ -642,7 +642,7 @@ gFameCheckerPersonName_Brock:: @ 0x81B030F
gFameCheckerPersonQuote_Brock:: @ 0x81B031B gFameCheckerPersonQuote_Brock:: @ 0x81B031B
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BROCK\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BROCK\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}In this big world of ours, there\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}In this big world of ours, there\n"
.string "must be many tough TRAINERS.\p" .string "must be many tough TRAINERS.\p"
.string "Let's both keep training and\n" .string "Let's both keep training and\n"
.string "making ourselves stronger!$" .string "making ourselves stronger!$"
@@ -653,7 +653,7 @@ gFameCheckerPersonName_Misty:: @ 0x81B03B3
gFameCheckerPersonQuote_Misty:: @ 0x81B03BF gFameCheckerPersonQuote_Misty:: @ 0x81B03BF
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: MISTY\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: MISTY\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I'm going to keep training here at\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I'm going to keep training here at\n"
.string "this GYM.\p" .string "this GYM.\p"
.string "When I get better, I'd love to hit\n" .string "When I get better, I'd love to hit\n"
.string "the road and travel.$" .string "the road and travel.$"
@@ -664,7 +664,7 @@ gFameCheckerPersonName_LtSurge:: @ 0x81B0446
gFameCheckerPersonQuote_LtSurge:: @ 0x81B0456 gFameCheckerPersonQuote_LtSurge:: @ 0x81B0456
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LT. SURGE\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LT. SURGE\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hey, kid!\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hey, kid!\n"
.string "You electrified me in our battle!\p" .string "You electrified me in our battle!\p"
.string "I didn't know that there were\n" .string "I didn't know that there were\n"
.string "gutsy TRAINERS like you.\p" .string "gutsy TRAINERS like you.\p"
@@ -677,7 +677,7 @@ gFameCheckerPersonName_Erika:: @ 0x81B0504
gFameCheckerPersonQuote_Erika:: @ 0x81B0510 gFameCheckerPersonQuote_Erika:: @ 0x81B0510
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: ERIKA\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: ERIKA\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am so glad that there are strong\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am so glad that there are strong\n"
.string "TRAINERS like you.\p" .string "TRAINERS like you.\p"
.string "That awareness alone inspires and\n" .string "That awareness alone inspires and\n"
.string "motivates me to try harder.\p" .string "motivates me to try harder.\p"
@@ -690,7 +690,7 @@ gFameCheckerPersonName_Koga:: @ 0x81B05C2
gFameCheckerPersonQuote_Koga:: @ 0x81B05CD gFameCheckerPersonQuote_Koga:: @ 0x81B05CD
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: KOGA\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: KOGA\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You and I, we must both set our\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You and I, we must both set our\n"
.string "sights higher and work towards\l" .string "sights higher and work towards\l"
.string "meeting our challenges.\p" .string "meeting our challenges.\p"
.string "Now, I must go train my daughter.$" .string "Now, I must go train my daughter.$"
@@ -701,7 +701,7 @@ gFameCheckerPersonName_Sabrina:: @ 0x81B0667
gFameCheckerPersonQuote_Sabrina:: @ 0x81B0675 gFameCheckerPersonQuote_Sabrina:: @ 0x81B0675
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: SABRINA\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: SABRINA\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The love you have towards your\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The love you have towards your\n"
.string "POKéMON…\p" .string "POKéMON…\p"
.string "It was a power that was never\n" .string "It was a power that was never\n"
.string "bested by my psychic power.$" .string "bested by my psychic power.$"
@@ -712,7 +712,7 @@ gFameCheckerPersonName_Blaine:: @ 0x81B06FB
gFameCheckerPersonQuote_Blaine:: @ 0x81B0708 gFameCheckerPersonQuote_Blaine:: @ 0x81B0708
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BLAINE\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BLAINE\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My fire POKéMON!\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My fire POKéMON!\n"
.string "They'll become even more powerful!\p" .string "They'll become even more powerful!\p"
.string "And now, a quiz. How many kinds of\n" .string "And now, a quiz. How many kinds of\n"
.string "FIRE-type POKéMON are there?$" .string "FIRE-type POKéMON are there?$"
@@ -723,7 +723,7 @@ gFameCheckerPersonName_Lorelei:: @ 0x81B079F
gFameCheckerPersonQuote_Lorelei:: @ 0x81B07AD gFameCheckerPersonQuote_Lorelei:: @ 0x81B07AD
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LORELEI\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LORELEI\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I needed to thank you for your\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I needed to thank you for your\n"
.string "help.\p" .string "help.\p"
.string "But that has nothing to do with our\n" .string "But that has nothing to do with our\n"
.string "battles.\p" .string "battles.\p"
@@ -735,7 +735,7 @@ gFameCheckerPersonName_Bruno:: @ 0x81B0845
gFameCheckerPersonQuote_Bruno:: @ 0x81B0851 gFameCheckerPersonQuote_Bruno:: @ 0x81B0851
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BRUNO\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BRUNO\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The super power of your POKéMON\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The super power of your POKéMON\n"
.string "and you I've experienced myself.\p" .string "and you I've experienced myself.\p"
.string "Next time, maybe I should show you\n" .string "Next time, maybe I should show you\n"
.string "how to train yourself.$" .string "how to train yourself.$"
@@ -746,7 +746,7 @@ gFameCheckerPersonName_Agatha:: @ 0x81B08EE
gFameCheckerPersonQuote_Agatha:: @ 0x81B08FB gFameCheckerPersonQuote_Agatha:: @ 0x81B08FB
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: AGATHA\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: AGATHA\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}When you grow older, don't you\n" .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}When you grow older, don't you\n"
.string "dare go soft like that coot OAK!\p" .string "dare go soft like that coot OAK!\p"
.string "Be like me and keep battling on!$" .string "Be like me and keep battling on!$"
@@ -756,7 +756,7 @@ gFameCheckerPersonName_Lance:: @ 0x81B097F
gFameCheckerPersonQuote_Lance:: @ 0x81B098B gFameCheckerPersonQuote_Lance:: @ 0x81B098B
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LANCE\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LANCE\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I'm considering going back to my\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I'm considering going back to my\n"
.string "hometown.\p" .string "hometown.\p"
.string "I want to retrain my DRAGON-type\n" .string "I want to retrain my DRAGON-type\n"
.string "POKéMON and strengthen them.\p" .string "POKéMON and strengthen them.\p"
@@ -769,7 +769,7 @@ gFameCheckerPersonName_Bill:: @ 0x81B0A45
gFameCheckerPersonQuote_Bill:: @ 0x81B0A50 gFameCheckerPersonQuote_Bill:: @ 0x81B0A50
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BILL\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BILL\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hey, there! CELIO had nothing but\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hey, there! CELIO had nothing but\n"
.string "praise for you.\p" .string "praise for you.\p"
.string "Hearing that makes me happy.\p" .string "Hearing that makes me happy.\p"
.string "When you catch some rare POKéMON,\n" .string "When you catch some rare POKéMON,\n"
@@ -781,7 +781,7 @@ gFameCheckerPersonName_MrFuji:: @ 0x81B0AFF
gFameCheckerPersonQuote_MrFuji:: @ 0x81B0B0E gFameCheckerPersonQuote_MrFuji:: @ 0x81B0B0E
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: MR. FUJI\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: MR. FUJI\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Instead of hoping for the happiness\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Instead of hoping for the happiness\n"
.string "of just your POKéMON…\p" .string "of just your POKéMON…\p"
.string "…Can I get you to wish for the\n" .string "…Can I get you to wish for the\n"
.string "happiness of all POKéMON?$" .string "happiness of all POKéMON?$"
@@ -792,7 +792,7 @@ gFameCheckerPersonName_Giovanni:: @ 0x81B0BA6
gFameCheckerPersonQuote_Giovanni:: @ 0x81B0BB5 gFameCheckerPersonQuote_Giovanni:: @ 0x81B0BB5
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: GIOVANNI\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: GIOVANNI\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}There is nothing that I wish to say\n" .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}There is nothing that I wish to say\n"
.string "to you.\p" .string "to you.\p"
.string "I will concentrate solely on\n" .string "I will concentrate solely on\n"
.string "bettering myself, and none other.$" .string "bettering myself, and none other.$"
data/text/pokedex_rating.inc
+1 -1
View File
@@ -8,7 +8,7 @@ PokedexRating_Text_SeenXOwnedY::
.string "on your POKéDEX is:\p" .string "on your POKéDEX is:\p"
.string "{STR_VAR_1} POKéMON seen and\n" .string "{STR_VAR_1} POKéMON seen and\n"
.string "{STR_VAR_2} POKéMON owned.\p" .string "{STR_VAR_2} POKéMON owned.\p"
.string "{SIZE}ÁPROF. OAK's rating:$" .string "{FONT_2}PROF. OAK's rating:$"
PokedexRating_Text_LessThan10:: PokedexRating_Text_LessThan10::
.string "You still have lots to do.\p" .string "You still have lots to do.\p"
include/battle.h
+14 -8
View File
@@ -55,6 +55,12 @@
#define MAX_TRAINER_ITEMS 4 #define MAX_TRAINER_ITEMS 4
enum {
BATTLER_AFFINE_NORMAL,
BATTLER_AFFINE_EMERGE,
BATTLER_AFFINE_RETURN,
};
#define MOVE_TARGET_SELECTED 0 #define MOVE_TARGET_SELECTED 0
#define MOVE_TARGET_DEPENDS (1 << 0) #define MOVE_TARGET_DEPENDS (1 << 0)
#define MOVE_TARGET_USER_OR_SELECTED (1 << 1) #define MOVE_TARGET_USER_OR_SELECTED (1 << 1)
@@ -545,15 +551,15 @@ struct BattleAnimationInfo
u8 field_6; u8 field_6;
u8 field_7; u8 field_7;
u8 ballThrowCaseId; u8 ballThrowCaseId;
u8 healthboxSlideInStarted : 1; u8 introAnimActive:1;
u8 field_9_x2 : 1; u8 wildMonInvisible:1;
u8 field_9_x1C : 3; u8 field_9_x1C:3;
u8 field_9_x20 : 1; u8 field_9_x20:1;
u8 field_9_x40 : 1; u8 field_9_x40:1;
u8 field_9_x80 : 1; u8 field_9_x80:1;
u8 field_A; u8 numBallParticles;
u8 field_B; u8 field_B;
s16 field_C; s16 ballSubpx;
u8 field_E; u8 field_E;
u8 field_F; u8 field_F;
}; };
include/battle_anim.h
+1 -1
View File
@@ -317,7 +317,7 @@ void AnimRecycle(struct Sprite *);
// battle_anim_special.c // battle_anim_special.c
void TryShinyAnimation(u8 battler, struct Pokemon *mon); void TryShinyAnimation(u8 battler, struct Pokemon *mon);
u8 ItemIdToBallId(u16 itemId); u8 ItemIdToBallId(u16 itemId);
u8 LaunchBallStarsTask(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId); u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId);
u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId); u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId);
void DoLoadHealthboxPalsForLevelUp(u8 *, u8 *, u8 battlerId); void DoLoadHealthboxPalsForLevelUp(u8 *, u8 *, u8 battlerId);
void DoFreeHealthboxPalsForLevelUp(u8 batterId); void DoFreeHealthboxPalsForLevelUp(u8 batterId);
include/battle_gfx_sfx_util.h
+1 -1
View File
@@ -40,6 +40,6 @@ void BattleInterfaceSetWindowPals(void);
void ClearTemporarySpeciesSpriteData(u8 battlerId, bool8 dontClearSubstitute); void ClearTemporarySpeciesSpriteData(u8 battlerId, bool8 dontClearSubstitute);
void AllocateMonSpritesGfx(void); void AllocateMonSpritesGfx(void);
void FreeMonSpritesGfx(void); void FreeMonSpritesGfx(void);
bool32 ShouldPlayNormalPokeCry(struct Pokemon *mon); bool32 ShouldPlayNormalMonCry(struct Pokemon *mon);
#endif // GUARD_BATTLE_GFX_SFX_UTIL_H #endif // GUARD_BATTLE_GFX_SFX_UTIL_H
include/battle_string_ids.h
+1 -1
View File
@@ -121,7 +121,7 @@
#define STRINGID_PKMNSTORINGENERGY 120 #define STRINGID_PKMNSTORINGENERGY 120
#define STRINGID_PKMNUNLEASHEDENERGY 121 #define STRINGID_PKMNUNLEASHEDENERGY 121
#define STRINGID_PKMNFATIGUECONFUSION 122 #define STRINGID_PKMNFATIGUECONFUSION 122
#define STRINGID_PKMNPICKEDUPITEM 123 #define STRINGID_PLAYERPICKEDUPMONEY 123
#define STRINGID_PKMNUNAFFECTED 124 #define STRINGID_PKMNUNAFFECTED 124
#define STRINGID_PKMNTRANSFORMEDINTO 125 #define STRINGID_PKMNTRANSFORMEDINTO 125
#define STRINGID_PKMNMADESUBSTITUTE 126 #define STRINGID_PKMNMADESUBSTITUTE 126
include/box_party_pokemon_dropdown.h
+2 -2
View File
@@ -14,8 +14,8 @@ enum
void AllocBoxPartyPokemonDropdowns(u8 num); void AllocBoxPartyPokemonDropdowns(u8 num);
void FreeBoxPartyPokemonDropdowns(void); void FreeBoxPartyPokemonDropdowns(void);
void CopyAllBoxPartyPokemonDropdownsToVram(void); void CopyAllBoxPartyPokemonDropdownsToVram(void);
void SetBoxPartyPokemonDropdownMap2(u8 idx, u8 bgId, const void * src, u16 width, u16 height); void SetBoxPartyPokemonDropdownMap2(u8 idx, u8 bgId, const void *src, u16 width, u16 height);
void SetBoxPartyPokemonDropdownMap1Tiles(u8 idx, const void * src); void SetBoxPartyPokemonDropdownMap1Tiles(u8 idx, const void *src);
void SetBoxPartyPokemonDropdownMap2Pos(u8 idx, u16 x, u16 y); void SetBoxPartyPokemonDropdownMap2Pos(u8 idx, u16 x, u16 y);
void SetBoxPartyPokemonDropdownMap2Rect(u8 idx, u16 x, u16 y, u16 width, u16 height); void SetBoxPartyPokemonDropdownMap2Rect(u8 idx, u16 x, u16 y, u16 width, u16 height);
void AdjustBoxPartyPokemonDropdownPos(u8 a0, u8 a1, s8 a2); void AdjustBoxPartyPokemonDropdownPos(u8 a0, u8 a1, s8 a2);
include/constants/battle.h
+4
View File
@@ -305,6 +305,10 @@
#define BATTLE_TERRAIN_LANCE 18 #define BATTLE_TERRAIN_LANCE 18
#define BATTLE_TERRAIN_CHAMPION 19 #define BATTLE_TERRAIN_CHAMPION 19
#define B_WAIT_TIME_LONG 64
#define B_WAIT_TIME_MED 48
#define B_WAIT_TIME_SHORT 32
#define CASTFORM_NORMAL 0 #define CASTFORM_NORMAL 0
#define CASTFORM_FIRE 1 #define CASTFORM_FIRE 1
#define CASTFORM_WATER 2 #define CASTFORM_WATER 2
include/constants/battle_anim.h
+2 -2
View File
@@ -354,9 +354,9 @@
#define B_ANIM_BAIT_THROW 0x4 #define B_ANIM_BAIT_THROW 0x4
#define B_ANIM_ITEM_KNOCKOFF 0x5 #define B_ANIM_ITEM_KNOCKOFF 0x5
#define B_ANIM_TURN_TRAP 0x6 #define B_ANIM_TURN_TRAP 0x6
#define B_ANIM_ITEM_EFFECT 0x7 #define B_ANIM_HELD_ITEM_EFFECT 0x7
#define B_ANIM_SMOKEBALL_ESCAPE 0x8 #define B_ANIM_SMOKEBALL_ESCAPE 0x8
#define B_ANIM_HANGED_ON 0x9 #define B_ANIM_FOCUS_BAND 0x9
#define B_ANIM_RAIN_CONTINUES 0xA #define B_ANIM_RAIN_CONTINUES 0xA
#define B_ANIM_SUN_CONTINUES 0xB #define B_ANIM_SUN_CONTINUES 0xB
#define B_ANIM_SANDSTORM_CONTINUES 0xC #define B_ANIM_SANDSTORM_CONTINUES 0xC
include/constants/fanfares.h
-22
View File
@@ -1,22 +0,0 @@
#ifndef GUARD_CONSTANTS_FANFARES_H
#define GUARD_CONSTANTS_FANFARES_H
enum Fanfares
{
FANFARE_00,
FANFARE_01,
FANFARE_02,
FANFARE_03,
FANFARE_04,
FANFARE_05,
FANFARE_06,
FANFARE_07,
FANFARE_08,
FANFARE_09,
FANFARE_10,
FANFARE_POKEFLUTE,
FANFARE_KEY_ITEM,
FANFARE_DEX_EVAL
};
#endif //GUARD_CONSTANTS_FANFARES_H
include/constants/songs.h
+2
View File
@@ -353,4 +353,6 @@
#define MUS_SLOW_PALLET 345 // MUS_RG_SLOWMASARA #define MUS_SLOW_PALLET 345 // MUS_RG_SLOWMASARA
#define MUS_TEACHY_TV_MENU 346 // MUS_RG_TVNOIZE #define MUS_TEACHY_TV_MENU 346 // MUS_RG_TVNOIZE
#define MUS_NONE 0xFFFF
#endif // GUARD_CONSTANTS_SONGS_H #endif // GUARD_CONSTANTS_SONGS_H
include/constants/sound.h
+44
View File
@@ -0,0 +1,44 @@
#ifndef GUARD_CONSTANTS_SOUND_H
#define GUARD_CONSTANTS_SOUND_H
#define FANFARE_LEVEL_UP 0
#define FANFARE_OBTAIN_ITEM 1
#define FANFARE_EVOLVED 2
#define FANFARE_OBTAIN_TMHM 3
#define FANFARE_HEAL 4
#define FANFARE_OBTAIN_BADGE 5
#define FANFARE_MOVE_DELETED 6
#define FANFARE_OBTAIN_BERRY 7
#define FANFARE_SLOTS_JACKPOT 8
#define FANFARE_SLOTS_WIN 9
#define FANFARE_TOO_BAD 10
#define FANFARE_POKE_FLUTE 11
#define FANFARE_KEY_ITEM 12
#define FANFARE_DEX_EVAL 13
#define CRY_MODE_NORMAL 0 // Default
#define CRY_MODE_DOUBLES 1 // Shortened cry for double battles
#define CRY_MODE_ENCOUNTER 2 // Used when starting a static encounter, or when a Pokémon is "aggressive"
#define CRY_MODE_HIGH_PITCH 3 // Highest pitch mode, used exclusively by the move Howl
#define CRY_MODE_ECHO_START 4 // For 1st half of cry used by the move Hyper Voice. Played in reverse
#define CRY_MODE_FAINT 5 // Used when a Pokémon faints
#define CRY_MODE_ECHO_END 6 // For 2nd half of cry used by the move Hyper Voice
#define CRY_MODE_ROAR_1 7 // For 1st cry used by the move Roar
#define CRY_MODE_ROAR_2 8 // For 2nd cry used by the move Roar
#define CRY_MODE_GROWL_1 9 // For 1st cry used by the move Growl. Played in reverse
#define CRY_MODE_GROWL_2 10 // For 2nd cry used by the move Growl
#define CRY_MODE_WEAK 11 // Used when a Pokémon is unhealthy
#define CRY_MODE_WEAK_DOUBLES 12 // Equivalent to CRY_MODE_DOUBLES for CRY_MODE_WEAK
// Given to SoundTask_PlayDoubleCry to determine which cry mode to use. Values are arbitrary
#define DOUBLE_CRY_ROAR 2
#define DOUBLE_CRY_GROWL 255
#define CRY_PRIORITY_NORMAL 10
#define CRY_PRIORITY_AMBIENT 1
// Cry volume was changed from 125 in R/S to 120 for FRLG/Em, but was (accidentally?) not updated outside of sound.c
#define CRY_VOLUME 120
#define CRY_VOLUME_RS 125
#endif //GUARD_CONSTANTS_SOUND_H
include/ereader_helpers.h
+1 -1
View File
@@ -31,6 +31,6 @@ void EReaderHelper_Timer3Callback(void);
void EReaderHelper_SaveRegsState(void); void EReaderHelper_SaveRegsState(void);
void EReaderHelper_ClearsSendRecvMgr(void); void EReaderHelper_ClearsSendRecvMgr(void);
void EReaderHelper_RestoreRegsState(void); void EReaderHelper_RestoreRegsState(void);
u16 EReaderHandleTransfer(u8 mode, size_t size, const void * src, void * dest); u16 EReaderHandleTransfer(u8 mode, size_t size, const void *src, void *dest);
#endif //GUARD_EREADER_HELPERS_H #endif //GUARD_EREADER_HELPERS_H
include/event_object_movement.h
+2 -2
View File
@@ -156,14 +156,14 @@ bool32 RfuUnionObjectIsWarping(u8 objectEventId);
u8 GetJumpSpecialMovementAction(u32 direction); u8 GetJumpSpecialMovementAction(u32 direction);
void EnableObjectGroundEffectsByXY(s16 x, s16 y); void EnableObjectGroundEffectsByXY(s16 x, s16 y);
void MoveObjectEventToMapCoords(struct ObjectEvent *objectEvent, s16 x, s16 y); void MoveObjectEventToMapCoords(struct ObjectEvent *objectEvent, s16 x, s16 y);
u8 CreateCopySpriteAt(struct Sprite * sprite, s16 x, s16 y, u8 subpriority); u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority);
u16 GetObjectPaletteTag(u8 paletteIndex); u16 GetObjectPaletteTag(u8 paletteIndex);
void SetSpritePosToMapCoords(s16 x, s16 y, s16 *x2, s16 *y2); void SetSpritePosToMapCoords(s16 x, s16 y, s16 *x2, s16 *y2);
void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible); void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible);
bool8 AreZCoordsCompatible(u8, u8); bool8 AreZCoordsCompatible(u8, u8);
u8 ZCoordToPriority(u8 z); u8 ZCoordToPriority(u8 z);
void ObjectEventUpdateZCoord(struct ObjectEvent *pObject); void ObjectEventUpdateZCoord(struct ObjectEvent *pObject);
void SetObjectSubpriorityByZCoord(u8 z, struct Sprite * sprite, u8 offset); void SetObjectSubpriorityByZCoord(u8 z, struct Sprite *sprite, u8 offset);
bool8 IsZCoordMismatchAt(u8, s16, s16); bool8 IsZCoordMismatchAt(u8, s16, s16);
void MakeObjectTemplateFromObjectEventGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables); void MakeObjectTemplateFromObjectEventGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables);
u8 AddCameraObject(u8 trackedSpriteId); u8 AddCameraObject(u8 trackedSpriteId);
include/field_effect.h
+3 -3
View File
@@ -20,12 +20,12 @@ void StartEscalatorWarp(u8 metatileBehavior, u8 priority);
void StartLavaridgeGymB1FWarp(u8 a0); void StartLavaridgeGymB1FWarp(u8 a0);
void StartLavaridgeGym1FWarp(u8 a0); void StartLavaridgeGym1FWarp(u8 a0);
void ApplyGlobalFieldPaletteTint(u8 paletteIdx); void ApplyGlobalFieldPaletteTint(u8 paletteIdx);
void FreeResourcesAndDestroySprite(struct Sprite * sprite, u8 spriteId); void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId);
u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, bool8 unused); u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, bool8 unused);
void ReturnToFieldFromFlyMapSelect(void); void ReturnToFieldFromFlyMapSelect(void);
void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b); void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
void SpriteCB_PopOutOfAsh(struct Sprite * sprite); void SpriteCB_PopOutOfAsh(struct Sprite *sprite);
void SpriteCB_AshLaunch(struct Sprite * sprite); void SpriteCB_AshLaunch(struct Sprite *sprite);
void FieldEffectActiveListClear(void); void FieldEffectActiveListClear(void);
#endif //GUARD_FIELD_EFFECTS_H #endif //GUARD_FIELD_EFFECTS_H
include/field_effect_helpers.h
+15 -15
View File
@@ -25,20 +25,20 @@ u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s
void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y); void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y);
void SetSpriteInvisible(u8 spriteId); void SetSpriteInvisible(u8 spriteId);
void SetSurfBlob_PlayerOffset(u8 spriteId, bool8 hasOffset, s16 offset); void SetSurfBlob_PlayerOffset(u8 spriteId, bool8 hasOffset, s16 offset);
void UpdateJumpImpactEffect(struct Sprite * sprite); void UpdateJumpImpactEffect(struct Sprite *sprite);
void UpdateShadowFieldEffect(struct Sprite * sprite); void UpdateShadowFieldEffect(struct Sprite *sprite);
void UpdateBubblesFieldEffect(struct Sprite * sprite); void UpdateBubblesFieldEffect(struct Sprite *sprite);
void UpdateSparkleFieldEffect(struct Sprite * sprite); void UpdateSparkleFieldEffect(struct Sprite *sprite);
void UpdateTallGrassFieldEffect(struct Sprite * sprite); void UpdateTallGrassFieldEffect(struct Sprite *sprite);
void WaitFieldEffectSpriteAnim(struct Sprite * sprite); void WaitFieldEffectSpriteAnim(struct Sprite *sprite);
void UpdateAshFieldEffect(struct Sprite * sprite); void UpdateAshFieldEffect(struct Sprite *sprite);
void UpdateSurfBlobFieldEffect(struct Sprite * sprite); void UpdateSurfBlobFieldEffect(struct Sprite *sprite);
void UpdateFootprintsTireTracksFieldEffect(struct Sprite * sprite); void UpdateFootprintsTireTracksFieldEffect(struct Sprite *sprite);
void UpdateSplashFieldEffect(struct Sprite * sprite); void UpdateSplashFieldEffect(struct Sprite *sprite);
void UpdateShortGrassFieldEffect(struct Sprite * sprite); void UpdateShortGrassFieldEffect(struct Sprite *sprite);
void UpdateLongGrassFieldEffect(struct Sprite * sprite); void UpdateLongGrassFieldEffect(struct Sprite *sprite);
void UpdateSandPileFieldEffect(struct Sprite * sprite); void UpdateSandPileFieldEffect(struct Sprite *sprite);
void UpdateDisguiseFieldEffect(struct Sprite * sprite); void UpdateDisguiseFieldEffect(struct Sprite *sprite);
void UpdateHotSpringsWaterFieldEffect(struct Sprite * sprite); void UpdateHotSpringsWaterFieldEffect(struct Sprite *sprite);
#endif //GUARD_FIELD_EFFECT_HELPERS_H #endif //GUARD_FIELD_EFFECT_HELPERS_H
include/field_player_avatar.h
+1 -1
View File
@@ -13,7 +13,7 @@ u8 GetPlayerMovementDirection(void);
u8 PlayerGetCopyableMovement(void); u8 PlayerGetCopyableMovement(void);
void MovePlayerNotOnBike(u8 direction, u16 heldKeys); void MovePlayerNotOnBike(u8 direction, u16 heldKeys);
void MovementType_Player(struct Sprite * sprite); void MovementType_Player(struct Sprite *sprite);
void HandleEnforcedLookDirectionOnPlayerStopMoving(void); void HandleEnforcedLookDirectionOnPlayerStopMoving(void);
void StopPlayerAvatar(void); void StopPlayerAvatar(void);
void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);
include/gba/m4a_internal.h
+2
View File
@@ -313,6 +313,8 @@ struct MusicPlayerTrack
#define MAX_MUSICPLAYER_TRACKS 16 #define MAX_MUSICPLAYER_TRACKS 16
#define TRACKS_ALL 0xFFFF
#define TEMPORARY_FADE 0x0001 #define TEMPORARY_FADE 0x0001
#define FADE_IN 0x0002 #define FADE_IN 0x0002
#define FADE_VOL_MAX 64 #define FADE_VOL_MAX 64
include/graphics.h
+27 -27
View File
@@ -3,30 +3,30 @@
#include "global.h" #include "global.h"
extern const u32 gInterfaceGfx_PokeBall[]; extern const u32 gBallGfx_Poke[];
extern const u32 gInterfacePal_PokeBall[]; extern const u32 gBallPal_Poke[];
extern const u32 gInterfaceGfx_GreatBall[]; extern const u32 gBallGfx_Great[];
extern const u32 gInterfacePal_GreatBall[]; extern const u32 gBallPal_Great[];
extern const u32 gInterfaceGfx_SafariBall[]; extern const u32 gBallGfx_Safari[];
extern const u32 gInterfacePal_SafariBall[]; extern const u32 gBallPal_Safari[];
extern const u32 gInterfaceGfx_UltraBall[]; extern const u32 gBallGfx_Ultra[];
extern const u32 gInterfacePal_UltraBall[]; extern const u32 gBallPal_Ultra[];
extern const u32 gInterfaceGfx_MasterBall[]; extern const u32 gBallGfx_Master[];
extern const u32 gInterfacePal_MasterBall[]; extern const u32 gBallPal_Master[];
extern const u32 gInterfaceGfx_NetBall[]; extern const u32 gBallGfx_Net[];
extern const u32 gInterfacePal_NetBall[]; extern const u32 gBallPal_Net[];
extern const u32 gInterfaceGfx_DiveBall[]; extern const u32 gBallGfx_Dive[];
extern const u32 gInterfacePal_DiveBall[]; extern const u32 gBallPal_Dive[];
extern const u32 gInterfaceGfx_NestBall[]; extern const u32 gBallGfx_Nest[];
extern const u32 gInterfacePal_NestBall[]; extern const u32 gBallPal_Nest[];
extern const u32 gInterfaceGfx_RepeatBall[]; extern const u32 gBallGfx_Repeat[];
extern const u32 gInterfacePal_RepeatBall[]; extern const u32 gBallPal_Repeat[];
extern const u32 gInterfaceGfx_TimerBall[]; extern const u32 gBallGfx_Timer[];
extern const u32 gInterfacePal_TimerBall[]; extern const u32 gBallPal_Timer[];
extern const u32 gInterfaceGfx_LuxuryBall[]; extern const u32 gBallGfx_Luxury[];
extern const u32 gInterfacePal_LuxuryBall[]; extern const u32 gBallPal_Luxury[];
extern const u32 gInterfaceGfx_PremierBall[]; extern const u32 gBallGfx_Premier[];
extern const u32 gInterfacePal_PremierBall[]; extern const u32 gBallPal_Premier[];
extern const u32 gOpenPokeballGfx[]; extern const u32 gOpenPokeballGfx[];
// pokemon gfx // pokemon gfx
@@ -2980,7 +2980,7 @@ extern const u8 gFile_graphics_items_icon_palettes_soda_pop_palette[];
extern const u8 gFile_graphics_items_icons_lemonade_sheet[]; extern const u8 gFile_graphics_items_icons_lemonade_sheet[];
extern const u8 gFile_graphics_items_icon_palettes_lemonade_palette[]; extern const u8 gFile_graphics_items_icon_palettes_lemonade_palette[];
extern const u8 gFile_graphics_items_icons_moomoo_milk_sheet[]; extern const u8 gFile_graphics_items_icons_moomoo_milk_sheet[];
extern const u8 gFile_graphics_items_icon_palettes_moomoo_milk_palette[];; extern const u8 gFile_graphics_items_icon_palettes_moomoo_milk_palette[];
extern const u8 gFile_graphics_items_icon_palettes_energy_powder_palette[]; extern const u8 gFile_graphics_items_icon_palettes_energy_powder_palette[];
extern const u8 gFile_graphics_items_icons_energy_root_sheet[]; extern const u8 gFile_graphics_items_icons_energy_root_sheet[];
extern const u8 gFile_graphics_items_icon_palettes_energy_root_palette[]; extern const u8 gFile_graphics_items_icon_palettes_energy_root_palette[];
@@ -4829,8 +4829,8 @@ extern const u16 gTradeButtons_Gfx[];
extern const u16 gTradeMenuMonBox_Tilemap[]; extern const u16 gTradeMenuMonBox_Tilemap[];
// mon_markings // mon_markings
extern const u16 gUnknown_8E9CBBC[]; extern const u16 gMonMarkingsMenu_Gfx[];
extern const u16 gUnknown_8E9CB9C[]; extern const u16 gMonMarkingsMenu_Pal[];
// hall_of_fame // hall_of_fame
extern const u32 gFile_graphics_misc_confetti_sheet[]; extern const u32 gFile_graphics_misc_confetti_sheet[];
include/help_system.h
+2 -2
View File
@@ -85,7 +85,7 @@ void HelpSystem_SetInputDelay(u8);
s32 HelpSystem_GetMenuInput(void); s32 HelpSystem_GetMenuInput(void);
void HS_UpdateMenuScrollArrows(void); void HS_UpdateMenuScrollArrows(void);
void DecompressAndRenderGlyph(u8 font, u16 glyph, struct Bitmap *srcBlit, struct Bitmap *destBlit, u8 *destBuffer, u8 x, u8 y, u8 width, u8 height); void DecompressAndRenderGlyph(u8 fontId, u16 glyph, struct Bitmap *srcBlit, struct Bitmap *destBlit, u8 *destBuffer, u8 x, u8 y, u8 width, u8 height);
void HelpSystem_PrintTextInTopLeftCorner(const u8 * str); void HelpSystem_PrintTextInTopLeftCorner(const u8 * str);
void HelpSystem_FillPanel3(void); void HelpSystem_FillPanel3(void);
void PrintListMenuItems(void); void PrintListMenuItems(void);
@@ -93,7 +93,7 @@ void PlaceListMenuCursor(void);
bool8 MoveCursor(u8 by, u8 dirn); bool8 MoveCursor(u8 by, u8 dirn);
void BackupHelpContext(void); void BackupHelpContext(void);
void RestoreHelpContext(void); void RestoreHelpContext(void);
void HelpSystemRenderText(u8 font, u8 * dest, const u8 * src, u8 x, u8 y, u8 width, u8 height); void HelpSystemRenderText(u8 fontId, u8 * dest, const u8 * src, u8 x, u8 y, u8 width, u8 height);
void HelpSystem_DisableToggleWithRButton(void); void HelpSystem_DisableToggleWithRButton(void);
#endif //GUARD_HELP_SYSTEM_H #endif //GUARD_HELP_SYSTEM_H
include/item_menu_icons.h
+1 -1
View File
@@ -22,7 +22,7 @@ void ItemMenuIcons_MoveInsertIndicatorBar(s16 x, u16 y);
void ItemMenuIcons_ToggleInsertIndicatorBarVisibility(bool8 invisible); void ItemMenuIcons_ToggleInsertIndicatorBarVisibility(bool8 invisible);
void SetBagVisualPocketId(u8); void SetBagVisualPocketId(u8);
void ShakeBagSprite(void); void ShakeBagSprite(void);
const void * GetItemIconGfxPtr(u16 itemId, u8 ptrId); const void *GetItemIconGfxPtr(u16 itemId, u8 ptrId);
void CreateBagOrSatchelSprite(u8 animNum); void CreateBagOrSatchelSprite(u8 animNum);
#endif // GUARD_ITEM_MENU_ICONS #endif // GUARD_ITEM_MENU_ICONS
include/link.h
+1 -1
View File
@@ -190,7 +190,7 @@ struct Link
struct BlockRequest struct BlockRequest
{ {
void * address; void *address;
u32 size; u32 size;
}; };
include/link_rfu.h
+1 -1
View File
@@ -221,7 +221,7 @@ void DestroyWirelessStatusIndicatorSprite(void);
void MEvent_CreateTask_CardOrNewsWithFriend(u32 arg0); void MEvent_CreateTask_CardOrNewsWithFriend(u32 arg0);
void MEvent_CreateTask_CardOrNewsOverWireless(u32 arg0); void MEvent_CreateTask_CardOrNewsOverWireless(u32 arg0);
void MEvent_CreateTask_Leader(u32 arg0); void MEvent_CreateTask_Leader(u32 arg0);
void Rfu_SendPacket(void * data); void Rfu_SendPacket(void *data);
u8 CreateTask_ListenToWireless(void); u8 CreateTask_ListenToWireless(void);
void LinkRfu_DestroyIdleTask(void); void LinkRfu_DestroyIdleTask(void);
void InitRFUAPI(void); void InitRFUAPI(void);
include/map_preview_screen.h
+3 -3
View File
@@ -43,9 +43,9 @@ struct MapPreviewScreen
u8 mapsec; u8 mapsec;
u8 type; u8 type;
u16 flagId; u16 flagId;
const void * tilesptr; const void *tilesptr;
const void * tilemapptr; const void *tilemapptr;
const void * palptr; const void *palptr;
}; };
u16 MapPreview_CreateMapNameWindow(u8 id); u16 MapPreview_CreateMapNameWindow(u8 id);
include/mevent.h
+3 -3
View File
@@ -25,7 +25,7 @@ struct MEvent_Str_1
{ {
u16 status; u16 status;
size_t size; size_t size;
const void * data; const void *data;
}; };
struct MEvent_Str_2 struct MEvent_Str_2
@@ -63,8 +63,8 @@ void MEvent_WonderCardResetUnk08_6(struct WonderCard * buffer);
bool32 MEvent_ReceiveDistributionMon(const u16 * data); bool32 MEvent_ReceiveDistributionMon(const u16 * data);
void BuildMEventClientHeader(struct MEventClientHeaderStruct * data); void BuildMEventClientHeader(struct MEventClientHeaderStruct * data);
bool32 ValidateMEventClientHeader(const struct MEventClientHeaderStruct * data); bool32 ValidateMEventClientHeader(const struct MEventClientHeaderStruct * data);
u32 sub_8144418(const u16 * a0, const struct MEventClientHeaderStruct * a1, void * unused); u32 sub_8144418(const u16 * a0, const struct MEventClientHeaderStruct * a1, void *unused);
u32 MEvent_CanPlayerReceiveDistributionMon(const u16 * a0, const struct MEventClientHeaderStruct * a1, void * unused); u32 MEvent_CanPlayerReceiveDistributionMon(const u16 * a0, const struct MEventClientHeaderStruct * a1, void *unused);
bool32 sub_8144474(const struct MEventClientHeaderStruct * a0, const u16 * a1); bool32 sub_8144474(const struct MEventClientHeaderStruct * a0, const u16 * a1);
u16 sub_81444B0(const struct MEventClientHeaderStruct * a0, u32 command); u16 sub_81444B0(const struct MEventClientHeaderStruct * a0, u32 command);
bool32 InitWonderCardResources(struct WonderCard * r5, struct WonderCardMetadata * r6); bool32 InitWonderCardResources(struct WonderCard * r5, struct WonderCardMetadata * r6);
include/mevent_server.h
+12 -12
View File
@@ -18,8 +18,8 @@ struct mevent_srv_sub
u16 sendCounter; u16 sendCounter;
u16 sendCRC; u16 sendCRC;
u16 sendSize; u16 sendSize;
void * recvBfr; void *recvBfr;
const void * sendBfr; const void *sendBfr;
u32 (*recvFunc)(struct mevent_srv_sub *); u32 (*recvFunc)(struct mevent_srv_sub *);
u32 (*sendFunc)(struct mevent_srv_sub *); u32 (*sendFunc)(struct mevent_srv_sub *);
}; };
@@ -59,10 +59,10 @@ struct mevent_client
u32 mainseqno; u32 mainseqno;
u32 flag; u32 flag;
u32 cmdidx; u32 cmdidx;
void * sendBuffer; void *sendBuffer;
void * recvBuffer; void *recvBuffer;
struct mevent_client_cmd * cmdBuffer; struct mevent_client_cmd * cmdBuffer;
void * buffer; void *buffer;
struct mevent_srv_sub manager; struct mevent_srv_sub manager;
}; };
@@ -70,7 +70,7 @@ struct mevent_server_cmd
{ {
u32 instr; u32 instr;
bool32 flag; bool32 flag;
void * parameter; void *parameter;
}; };
// Server commands // Server commands
@@ -99,13 +99,13 @@ struct mevent_srv_common
u32 mainseqno; u32 mainseqno;
u32 cmdidx; u32 cmdidx;
const struct mevent_server_cmd * cmdBuffer; const struct mevent_server_cmd * cmdBuffer;
void * recvBuffer; void *recvBuffer;
struct WonderCard * card; struct WonderCard * card;
struct WonderNews * news; struct WonderNews * news;
struct MEventClientHeaderStruct * mevent_unk1442cc; struct MEventClientHeaderStruct * mevent_unk1442cc;
void * sendBuffer1; void *sendBuffer1;
u32 sendBuffer1Size; u32 sendBuffer1Size;
void * sendBuffer2; void *sendBuffer2;
u32 sendBuffer2Size; u32 sendBuffer2Size;
u32 sendWord; u32 sendWord;
struct mevent_srv_sub manager; struct mevent_srv_sub manager;
@@ -114,13 +114,13 @@ struct mevent_srv_common
u32 mevent_srv_sub_recv(struct mevent_srv_sub * svr); u32 mevent_srv_sub_recv(struct mevent_srv_sub * svr);
u32 mevent_srv_sub_send(struct mevent_srv_sub * svr); u32 mevent_srv_sub_send(struct mevent_srv_sub * svr);
void mevent_srv_sub_init(struct mevent_srv_sub * svr, u32 sendPlayerNo, u32 recvPlayerNo); void mevent_srv_sub_init(struct mevent_srv_sub * svr, u32 sendPlayerNo, u32 recvPlayerNo);
void mevent_srv_sub_init_send(struct mevent_srv_sub * svr, u32 ident, const void * src, u32 size); void mevent_srv_sub_init_send(struct mevent_srv_sub * svr, u32 ident, const void *src, u32 size);
void mevent_srv_sub_init_recv(struct mevent_srv_sub * svr, u32 ident, void * dest); void mevent_srv_sub_init_recv(struct mevent_srv_sub * svr, u32 ident, void *dest);
void mevent_client_do_init(void); void mevent_client_do_init(void);
u32 mevent_client_do_exec(u16 * a0); u32 mevent_client_do_exec(u16 * a0);
void mevent_client_inc_flag(void); void mevent_client_inc_flag(void);
void * mevent_client_get_buffer(void); void *mevent_client_get_buffer(void);
void mevent_client_set_param(u32 a0); void mevent_client_set_param(u32 a0);
void mevent_srv_init_wnews(void); void mevent_srv_init_wnews(void);
void mevent_srv_new_wcard(void); void mevent_srv_new_wcard(void);
include/mon_markings.h
+18 -16
View File
@@ -1,33 +1,35 @@
#ifndef GUARD_MON_MARKINGS_H #ifndef GUARD_MON_MARKINGS_H
#define GUARD_MON_MARKINGS_H #define GUARD_MON_MARKINGS_H
struct PokemonMarkMenu #define NUM_MON_MARKINGS 4
struct MonMarkingsMenu
{ {
/*0x0000*/ u16 baseTileTag; /*0x0000*/ u16 baseTileTag;
/*0x0002*/ u16 basePaletteTag; /*0x0002*/ u16 basePaletteTag;
/*0x0004*/ u8 markings; // bit flags /*0x0004*/ u8 markings; // bit flags
/*0x0005*/ s8 cursorPos; /*0x0005*/ s8 cursorPos;
/*0x0006*/ bool8 markingsArray[4]; /*0x0006*/ bool8 markingsArray[NUM_MON_MARKINGS];
/*0x000A*/ u8 cursorBaseY; /*0x000A*/ u8 cursorBaseY;
/*0x000B*/ bool8 spriteSheetLoadRequired; /*0x000B*/ bool8 spriteSheetLoadRequired;
/*0x000C*/ struct Sprite * menuWindowSprites[2]; // upper and lower halves of menu window /*0x000C*/ struct Sprite *windowSprites[2]; // upper and lower halves of menu window
/*0x0014*/ struct Sprite * menuMarkingSprites[4]; /*0x0014*/ struct Sprite *markingSprites[NUM_MON_MARKINGS];
/*0x0024*/ struct Sprite * unkSprite; /*0x0024*/ struct Sprite *cursorSprite;
/*0x0028*/ struct Sprite * menuTextSprite; /*0x0028*/ struct Sprite *textSprite;
/*0x002C*/ const u8 *frameTiles; /*0x002C*/ const u8 *frameTiles;
/*0x0030*/ const u16 *framePalette; /*0x0030*/ const u16 *framePalette;
/*0x0034*/ u8 menuWindowSpriteTiles[0x1000]; /*0x0034*/ u8 windowSpriteTiles[0x1000];
/*0x1034*/ u8 filler1034[0x80]; /*0x1034*/ u8 unused[0x80];
/*0x10B4*/ u8 tileLoadState; /*0x10B4*/ u8 tileLoadState;
}; // 10b8 }; // 10b8
void SetMonMarkingsMenuPointer(struct PokemonMarkMenu * markMenu); void InitMonMarkingsMenu(struct MonMarkingsMenu *ptr);
void LoadMonMarkingsFrameGfx(void); void BufferMonMarkingsMenuTiles(void);
void DrawMonMarkingsMenu(u8 markings, s16 x, s16 y); void OpenMonMarkingsMenu(u8 markings, s16 x, s16 y);
void TeardownMonMarkingsMenu(void); void FreeMonMarkingsMenu(void);
bool8 MonMarkingsHandleInput(void); bool8 HandleMonMarkingsMenuInput(void);
struct Sprite * CreateMonMarkingSprite_SelectCombo(u16 tileTag, u16 paletteTag, const u16 *palette); struct Sprite *CreateMonMarkingAllCombosSprite(u16 tileTag, u16 paletteTag, const u16 *palette);
struct Sprite * CreateMonMarkingSprite_AllOff(u16 tileTag, u16 paletteTag, const u16 *palette); struct Sprite *CreateMonMarkingComboSprite(u16 tileTag, u16 paletteTag, const u16 *palette);
void RequestDma3LoadMonMarking(u8 markings, void * dest); void UpdateMonMarkingTiles(u8 markings, void *dest);
#endif //GUARD_MON_MARKINGS_H #endif //GUARD_MON_MARKINGS_H
include/new_menu_helpers.h
+2 -2
View File
@@ -14,7 +14,7 @@ void *DecompressAndCopyTileDataToVram(u8 bgId, const void *src, u32 size, u16 of
void *DecompressAndCopyTileDataToVram2(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); void *DecompressAndCopyTileDataToVram2(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
void DecompressAndLoadBgGfxUsingHeap2(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); void DecompressAndLoadBgGfxUsingHeap2(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
void * MallocAndDecompress(const void * src, u32 * size); void *MallocAndDecompress(const void *src, u32 * size);
void SetBgTilemapPalette(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); void SetBgTilemapPalette(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
void CopyToBufferFromBgTilemap(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height); void CopyToBufferFromBgTilemap(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height);
void ResetBgPositions(void); void ResetBgPositions(void);
@@ -36,7 +36,7 @@ void SetStdWindowBorderStyle(u8 windowId, bool8 copyToVram);
void sub_80F7768(u8 windowId, bool8 copyToVram); void sub_80F7768(u8 windowId, bool8 copyToVram);
void Menu_LoadStdPal(void); void Menu_LoadStdPal(void);
void Menu_LoadStdPalAt(u16 offset); void Menu_LoadStdPalAt(u16 offset);
void DisplayItemMessageOnField(u8 taskId, u8 textSpeed, const u8 *src, TaskFunc callback); void DisplayItemMessageOnField(u8 taskId, u8 fontId, const u8 *src, TaskFunc callback);
void DisplayYesNoMenuDefaultYes(void); void DisplayYesNoMenuDefaultYes(void);
void DisplayYesNoMenuDefaultNo(void); void DisplayYesNoMenuDefaultNo(void);
u8 GetTextSpeedSetting(void); u8 GetTextSpeedSetting(void);
include/pokeball.h
+9 -1
View File
@@ -20,6 +20,14 @@ enum
POKEBALL_COUNT POKEBALL_COUNT
}; };
enum {
BALL_AFFINE_ANIM_0,
BALL_ROTATE_RIGHT,
BALL_ROTATE_LEFT,
BALL_AFFINE_ANIM_3,
BALL_AFFINE_ANIM_4
};
extern const struct CompressedSpriteSheet gBallSpriteSheets[POKEBALL_COUNT]; extern const struct CompressedSpriteSheet gBallSpriteSheets[POKEBALL_COUNT];
extern const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT]; extern const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT];
extern const struct SpriteTemplate gBallSpriteTemplates[]; extern const struct SpriteTemplate gBallSpriteTemplates[];
@@ -34,6 +42,6 @@ void DoHitAnimHealthboxEffect(u8 bank);
void LoadBallGfx(u8 ballId); void LoadBallGfx(u8 ballId);
void FreeBallGfx(u8 ballId); void FreeBallGfx(u8 ballId);
void StartHealthboxSlideIn(u8 battler); void StartHealthboxSlideIn(u8 battler);
void DestroySpriteAndFreeResources2(struct Sprite *sprite); void DestroySpriteAndFreeResources_Ball(struct Sprite *sprite);
#endif // GUARD_POKEBALL_H #endif // GUARD_POKEBALL_H
include/pokedex_area_markers.h
+1 -1
View File
@@ -4,7 +4,7 @@
struct PAM_TaskData struct PAM_TaskData
{ {
struct SubspriteTable subsprites; struct SubspriteTable subsprites;
void * buffer; void *buffer;
u8 unk_0C; u8 unk_0C;
u8 spr_id; u8 spr_id;
u16 tilesTag; u16 tilesTag;
include/pokemon_icon.h
+2 -2
View File
@@ -19,10 +19,10 @@ void DestroyMonIcon(struct Sprite *);
u16 GetUnownLetterByPersonality(u32 personality); u16 GetUnownLetterByPersonality(u32 personality);
void SpriteCB_MonIcon(struct Sprite *); void SpriteCB_MonIcon(struct Sprite *);
u8 CreateMonIcon(u16 species, SpriteCallback callback, s16 x, s16 y, u8 subpriority, u32 personality, bool32 extra); u8 CreateMonIcon(u16 species, SpriteCallback callback, s16 x, s16 y, u8 subpriority, u32 personality, bool32 extra);
u8 UpdateMonIconFrame(struct Sprite * sprite); u8 UpdateMonIconFrame(struct Sprite *sprite);
void LoadMonIconPalette(u16 iconId); void LoadMonIconPalette(u16 iconId);
void FreeMonIconPalette(u16 iconId); void FreeMonIconPalette(u16 iconId);
void SetPartyHPBarSprite(struct Sprite * sprite, u8 animNum); void SetPartyHPBarSprite(struct Sprite *sprite, u8 animNum);
u8 GetMonIconPaletteIndexFromSpecies(u16 species); u8 GetMonIconPaletteIndexFromSpecies(u16 species);
u16 GetIconSpecies(u16 species, u32 personality); u16 GetIconSpecies(u16 species, u32 personality);
void LoadMonIconPalettesAt(u16 offset); void LoadMonIconPalettesAt(u16 offset);
include/pokemon_special_anim_internal.h
+2 -2
View File
@@ -25,8 +25,8 @@ struct PokemonSpecialAnimScene
u16 monSpriteY1; u16 monSpriteY1;
u16 monSpriteY2; u16 monSpriteY2;
u8 lastCloseness; u8 lastCloseness;
struct Sprite * monSprite; struct Sprite *monSprite;
struct Sprite * itemIconSprite; struct Sprite *itemIconSprite;
u8 textBuf[0x900]; u8 textBuf[0x900];
u8 field_0914[BG_SCREEN_SIZE]; u8 field_0914[BG_SCREEN_SIZE];
u8 field_1114[BG_SCREEN_SIZE]; u8 field_1114[BG_SCREEN_SIZE];
include/pokemon_storage_system.h
+1
View File
@@ -26,6 +26,7 @@ enum
WALLPAPER_PLAIN, WALLPAPER_PLAIN,
WALLPAPER_COUNT WALLPAPER_COUNT
}; };
#define MAX_DEFAULT_WALLPAPER WALLPAPER_SAVANNA
u8 *GetBoxNamePtr(u8 boxNumber); u8 *GetBoxNamePtr(u8 boxNumber);
struct BoxPokemon *GetBoxedMonPtr(u8 boxId, u8 monPosition); struct BoxPokemon *GetBoxedMonPtr(u8 boxId, u8 monPosition);
include/pokemon_storage_system_internal.h
+137 -131
View File
@@ -7,9 +7,14 @@
#define IN_BOX_COLUMNS 5 #define IN_BOX_COLUMNS 5
#define IN_BOX_ROWS 6 #define IN_BOX_ROWS 6
#define MAX_MON_ICONS 40 // The maximum number of Pokémon icons that can appear on-screen.
// By default the limit is 40 (though in practice only 37 can be).
#define MAX_MON_ICONS (IN_BOX_COUNT + PARTY_SIZE + 1 >= 40 ? IN_BOX_COUNT + PARTY_SIZE + 1 : 40)
// The maximum number of item icons that can appear on-screen while
// moving held items. 1 in the cursor, and 2 more while switching
// between 2 Pokémon with held items
#define MAX_ITEM_ICONS 3 #define MAX_ITEM_ICONS 3
#define MAX_MENU_ITEMS 7
enum enum
{ {
@@ -20,11 +25,12 @@ enum
enum enum
{ {
BOX_OPTION_WITHDRAW, OPTION_WITHDRAW,
BOX_OPTION_DEPOSIT, OPTION_DEPOSIT,
BOX_OPTION_MOVE_MONS, OPTION_MOVE_MONS,
BOX_OPTION_MOVE_ITEMS, OPTION_MOVE_ITEMS,
BOX_OPTION_EXIT, OPTION_EXIT,
OPTIONS_COUNT
}; };
enum enum
@@ -167,19 +173,19 @@ struct StorageAction
u8 format; u8 format;
}; };
struct UnkPSSStruct_2002370 struct ChooseBoxMenu
{ {
struct Sprite *unk_0000; struct Sprite *menuSprite;
struct Sprite *unk_0004[4]; struct Sprite *menuSideSprites[4];
u32 unk_0014[3]; // unused u32 unused1[3];
struct Sprite *unk_0020[2]; struct Sprite *arrowSprites[2];
u8 buffer[0x200]; // passed but not used u8 buffer[0x200]; // passed but not used
u8 strbuf[20]; u8 strbuf[20];
bool32 loadPal; bool32 loadedPalette;
u16 tilesTag; u16 tileTag;
u16 paletteTag; u16 paletteTag;
u8 curBox; u8 curBox;
u8 unk_0245; // unused u8 unused3;
u8 subpriority; u8 subpriority;
}; };
@@ -189,21 +195,21 @@ struct StorageMenu
int textId; int textId;
}; };
struct UnkStruct_2000028 struct UnkUtilData
{ {
const u8 *unk_00; const u8 *src;
u8 *unk_04; u8 *dest;
u16 unk_08; u16 size;
u16 unk_0a; u16 unk;
u16 newField; u16 height;
void (*unk_0c)(struct UnkStruct_2000028 *data); void (*func)(struct UnkUtilData *data);
}; };
struct UnkStruct_2000020 struct UnkUtil
{ {
struct UnkStruct_2000028 *unk_00; struct UnkUtilData *data;
u8 unk_04; u8 numActive;
u8 unk_05; u8 max;
}; };
struct PSS_ItemIconSprite struct PSS_ItemIconSprite
@@ -231,115 +237,115 @@ struct PokemonStorageSystemData
u8 screenChangeType; u8 screenChangeType;
bool8 isReshowingPSS; bool8 isReshowingPSS;
u8 taskId; u8 taskId;
struct UnkStruct_2000020 unk_0020; struct UnkUtil unkUtil;
struct UnkStruct_2000028 unk_0028[8]; struct UnkUtilData unkUtilData[8];
u16 field_B0[528 / 2]; u16 partyMenuTilemapBuffer[0x108];
u16 field_2C0; u16 partyMenuUnused1; // Never read
u16 field_2C2; u16 partyMenuY;
u8 field_2C4; u8 partyMenuUnused2; // Unused
u8 field_2C5; u8 partyMenuMoveTimer;
u8 showPartyMenuState; u8 showPartyMenuState;
bool8 unk_02C7; bool8 closeBoxFlashing;
u8 unk_02C8; u8 closeBoxFlashTimer;
bool8 unk_02C9; bool8 closeBoxFlashState;
s16 newCurrBoxId; s16 newCurrBoxId;
u16 bg2_X; u16 bg2_X;
s16 field_2CE; s16 scrollSpeed;
u16 field_2D0; u16 scrollTimer;
u8 field_2D2; u8 wallpaperOffset;
u8 field_2D3; u8 scrollUnused1; // Never read
u8 field_2D4; u8 scrollToBoxIdUnused; // Never read
u16 field_2D6; u16 scrollUnused2; // Never read
s16 field_2D8; s16 scrollDirectionUnused; // Never read.
u16 field_2DA; u16 scrollUnused3; // Never read
u16 field_2DC; u16 scrollUnused4; // Never read
u16 field_2DE; u16 scrollUnused5; // Never read
u16 field_2E0; u16 scrollUnused6; // Never read
u8 filler[22]; u8 filler1[22];
u8 field_2F8[512]; u8 field_2F8[512];
u8 field_4F8[512]; u8 field_4F8[512];
u8 field_6F8; u8 boxTitleCycleId;
u8 field_6F9; u8 wallpaperLoadState; // Written to, but never read.
u8 field_6FA; u8 wallpaperLoadBoxId;
s8 field_6FB; s8 wallpaperLoadDir;
u16 field_6FC[16]; u16 boxTitlePal[16];
u16 field_71C; u16 boxTitlePalOffset;
u16 field_71E; u16 boxTitleAltPalOffset;
struct Sprite *field_720[2]; struct Sprite *curBoxTitleSprites[2];
struct Sprite *field_728[2]; struct Sprite *nextBoxTitleSprites[2];
struct Sprite *field_730[2]; struct Sprite *arrowSprites[2];
u32 field_738; u32 wallpaperPalBits;
u8 field_73C[80]; u8 filler2[80]; // Unused
u16 field_78C; u16 unkUnused1; // Never read.
s16 wallpaperSetId; s16 wallpaperSetId;
s16 wallpaperId; s16 wallpaperId;
u16 field_792[360]; u16 wallpaperTilemap[360];
u8 wallpaperChangeState; u8 wallpaperChangeState;
u8 field_A63; u8 scrollState;
u8 field_A64; u8 scrollToBoxId;
s8 field_A65; s8 scrollDirection;
// u8 *wallpaperTiles; // used only in Emerald for Walda // u8 *wallpaperTiles; // used only in Emerald for Walda
/* 0a68 */ struct Sprite *movingMonSprite; /* 0a68 */ struct Sprite *movingMonSprite;
/* 0a6c */ struct Sprite *partySprites[PARTY_SIZE]; /* 0a6c */ struct Sprite *partySprites[PARTY_SIZE];
/* 0a84 */ struct Sprite *boxMonsSprites[IN_BOX_COUNT]; /* 0a84 */ struct Sprite *boxMonsSprites[IN_BOX_COUNT];
/* 0afc */ struct Sprite **field_B00; /* 0afc */ struct Sprite **shiftMonSpritePtr;
/* 0b00 */ struct Sprite **field_B04; /* 0b00 */ struct Sprite **releaseMonSpritePtr;
/* 0b04 */ u16 field_B08[MAX_MON_ICONS]; /* 0b04 */ u16 numIconsPerSpecies[MAX_MON_ICONS];
/* 0b54 */ u16 field_B58[MAX_MON_ICONS]; /* 0b54 */ u16 iconSpeciesList[MAX_MON_ICONS];
/* 0ba4 */ u16 boxSpecies[IN_BOX_COUNT]; /* 0ba4 */ u16 boxSpecies[IN_BOX_COUNT];
/* 0be0 */ u32 boxPersonalities[IN_BOX_COUNT]; /* 0be0 */ u32 boxPersonalities[IN_BOX_COUNT];
/* 0c58 */ u8 field_C5C; /* 0c58 */ u8 incomingBoxId;
/* 0c59 */ u8 field_C5D; /* 0c59 */ u8 shiftTimer;
/* 0c5a */ u8 field_C5E; /* 0c5a */ u8 numPartyToCompact;
/* 0c5c */ u16 field_C60; /* 0c5c */ u16 iconScrollDistance;
/* 0c5e */ s16 field_C62; /* 0c5e */ s16 iconScrollPos;
/* 0c60 */ s16 field_C64; /* 0c60 */ s16 iconScrollSpeed;
/* 0c62 */ u16 field_C66; /* 0c62 */ u16 iconScrollNumIncoming;
/* 0c64 */ u8 field_C68; /* 0c64 */ u8 iconScrollCurColumn;
/* 0c65 */ s8 field_C69; /* 0c65 */ s8 iconScrollDirection; // Unnecessary duplicate of scrollDirection
/* 0c66 */ u8 field_C6A; /* 0c66 */ u8 iconScrollState;
/* 0c67 */ u8 field_C6B; /* 0c67 */ u8 iconScrollToBoxId; // Unused duplicate of scrollToBoxId
/* 0c68 */ struct WindowTemplate menuWindow; /* 0c68 */ struct WindowTemplate menuWindow;
/* 0c70 */ struct StorageMenu menuItems[MAX_MENU_ITEMS]; /* 0c70 */ struct StorageMenu menuItems[7];
/* 0ca8 */ u8 menuItemsCount; /* 0ca8 */ u8 menuItemsCount;
/* 0ca9 */ u8 menuWidth; /* 0ca9 */ u8 menuWidth;
/* 0caa */ u8 field_CAE; /* 0caa */ u8 menuUnusedField; // Never read.
/* 0cac */ u16 field_CB0; /* 0cac */ u16 menuWindowId;
/* 0cb0 */ struct Sprite *field_CB4; /* 0cb0 */ struct Sprite *cursorSprite;
/* 0cb4 */ struct Sprite *field_CB8; /* 0cb4 */ struct Sprite *cursorShadowSprite;
/* 0cb8 */ s32 field_CBC; /* 0cb8 */ s32 cursorNewX;
/* 0cbc */ s32 field_CC0; /* 0cbc */ s32 cursorNewY;
/* 0cc0 */ u32 field_CC4; /* 0cc0 */ u32 cursorSpeedX;
/* 0cc4 */ u32 field_CC8; /* 0cc4 */ u32 cursorSpeedY;
/* 0cc8 */ s16 field_CCC; /* 0cc8 */ s16 cursorTargetX;
/* 0cca */ s16 field_CCE; /* 0cca */ s16 cursorTargetY;
/* 0ccc */ u16 field_CD0; /* 0ccc */ u16 cursorMoveSteps;
/* 0cce */ s8 field_CD2; /* 0cce */ s8 cursorVerticalWrap;
/* 0ccf */ s8 field_CD3; /* 0ccf */ s8 cursorHorizontalWrap;
/* 0cd0 */ u8 field_CD4; /* 0cd0 */ u8 newCursorArea;
/* 0cd1 */ u8 field_CD5; /* 0cd1 */ u8 newCursorPosition;
/* 0cd2 */ u8 field_CD6; /* 0cd2 */ u8 cursorPrevHorizPos;
/* 0cd3 */ u8 field_CD7; /* 0cd3 */ u8 cursorFlipTimer;
/* 0cd4 */ u8 field_CD8[2]; /* 0cd4 */ u8 cursorPalNums[2];
/* 0cd8 */ const u32 *cursorMonPalette; /* 0cd8 */ const u32 *displayMonPalette;
/* 0cdc */ u32 cursorMonPersonality; /* 0cdc */ u32 displayMonPersonality;
/* 0ce0 */ u16 cursorMonSpecies; /* 0ce0 */ u16 displayMonSpecies;
/* 0ce2 */ u16 cursorMonItem; /* 0ce2 */ u16 displayMonItemId;
/* 0ce4 */ u16 field_CE8; /* 0ce4 */ u16 displayUnusedVar;
/* 0ce6 */ bool8 setMosaic; /* 0ce6 */ bool8 setMosaic;
/* 0ce7 */ u8 cursorMonMarkings; /* 0ce7 */ u8 displayMonMarkings;
/* 0ce8 */ u8 cursorMonLevel; /* 0ce8 */ u8 displayMonLevel;
/* 0ce9 */ bool8 cursorMonIsEgg; /* 0ce9 */ bool8 displayMonIsEgg;
/* 0cea */ u8 cursorMonNick[POKEMON_NAME_LENGTH + 1]; /* 0cea */ u8 displayMonName[POKEMON_NAME_LENGTH + 1];
/* 0cf5 */ u8 cursorMonTexts[4][36]; /* 0cf5 */ u8 displayMonTexts[4][36];
/* 0d88 */ bool8 (*monPlaceChangeFunc)(void); /* 0d88 */ bool8 (*monPlaceChangeFunc)(void);
/* 0d8c */ u8 monPlaceChangeState; /* 0d8c */ u8 monPlaceChangeState;
/* 0d8d */ u8 field_D91; /* 0d8d */ u8 shiftBoxId;
/* 0d90 */ struct Sprite *monMarkingSprite; /* 0d90 */ struct Sprite *markingComboSprite;
/* 0d94 */ struct Sprite *field_D98[2]; /* 0d94 */ struct Sprite *waveformSprites[2];
/* 0d9c */ u16 *monMarkingSpriteTileStart; /* 0d9c */ u16 *markingComboTilesPtr;
/* 0da0 */ struct PokemonMarkMenu field_DA4; /* 0da0 */ struct MonMarkingsMenu markMenu;
/* 1e58 */ struct UnkPSSStruct_2002370 field_1E5C; /* 1e58 */ struct ChooseBoxMenu field_1E5C;
/* 20a0 */ struct Pokemon movingMon; /* 20a0 */ struct Pokemon movingMon;
/* 2104 */ struct Pokemon field_2108; /* 2104 */ struct Pokemon field_2108;
/* 2168 */ u8 field_216C; /* 2168 */ u8 field_216C;
@@ -366,9 +372,9 @@ struct PokemonStorageSystemData
/* 21db */ u8 itemName[20]; /* 21db */ u8 itemName[20];
/* 21ef */ u8 inBoxMovingMode; /* 21ef */ u8 inBoxMovingMode;
/* 21f0 */ u16 field_2200; /* 21f0 */ u16 field_2200;
/* 21f4 */ struct PSS_ItemIconSprite itemIconSprites[MAX_ITEM_ICONS]; /* 21f4 */ struct PSS_ItemIconSprite itemIcons[MAX_ITEM_ICONS];
/* 2224 */ u16 movingItem; /* 2224 */ u16 movingItemId;
/* 2226 */ u16 field_2236; /* 2226 */ u16 itemInfoWindowOffset;
/* 2228 */ struct PssQuestLogBuffer qlogBuffer; /* 2228 */ struct PssQuestLogBuffer qlogBuffer;
/* 2230 */ u16 field_2238; /* 2230 */ u16 field_2238;
/* 2232 */ u16 field_223A; /* 2232 */ u16 field_223A;
@@ -377,7 +383,7 @@ struct PokemonStorageSystemData
/* 223c */ u16 field_2244[0x40]; /* 223c */ u16 field_2244[0x40];
/* 22bc */ u8 field_22C4[0x800]; /* 22bc */ u8 field_22C4[0x800];
/* 2abc */ u8 field_2AC4[0x1800]; /* 2abc */ u8 field_2AC4[0x1800];
/* 42bc */ u8 field_42C4[0x800]; /* 42bc */ u8 itemIconBuffer[0x800];
/* 4abc */ u8 field_4AC4[0x1000]; /* 4abc */ u8 field_4AC4[0x1000];
/* 5abc */ u8 field_5AC4[0x800]; /* 5abc */ u8 field_5AC4[0x800];
}; // size=62bc }; // size=62bc
@@ -386,18 +392,18 @@ extern struct PokemonStorageSystemData *gPSSData;
void Cb2_EnterPSS(u8 a0); void Cb2_EnterPSS(u8 a0);
u8 GetCurrentBoxOption(void); u8 GetCurrentBoxOption(void);
struct Sprite *sub_809223C(u16 x, u16 y, u8 animId, u8 priority, u8 subpriority); struct Sprite *CreateChooseBoxArrows(u16 x, u16 y, u8 animId, u8 priority, u8 subpriority);
void SetBoxWallpaper(u8 boxId, u8 wallpaperId); void SetBoxWallpaper(u8 boxId, u8 wallpaperId);
void SetCurrentBox(u8 boxId); void SetCurrentBox(u8 boxId);
void BoxMonAtToMon(u8 boxId, u8 boxPosition, struct Pokemon * dst); void BoxMonAtToMon(u8 boxId, u8 boxPosition, struct Pokemon * dst);
void SetBoxMonAt(u8 boxId, u8 boxPosition, struct BoxPokemon * src); void SetBoxMonAt(u8 boxId, u8 boxPosition, struct BoxPokemon * src);
void Cb2_ExitPSS(void); void CB2_ExitPokeStorage(void);
void FreeBoxSelectionPopupSpriteGfx(void); void FreeBoxSelectionPopupSpriteGfx(void);
void sub_808C940(u8 curBox); void sub_808C940(u8 curBox);
void sub_808C950(void); void sub_808C950(void);
u8 HandleBoxChooseSelectionInput(void); u8 HandleBoxChooseSelectionInput(void);
void LoadBoxSelectionPopupSpriteGfx(struct UnkPSSStruct_2002370 *a0, u16 tileTag, u16 palTag, u8 a3, bool32 loadPal); void LoadChooseBoxMenuGfx(struct ChooseBoxMenu *a0, u16 tileTag, u16 palTag, u8 a3, bool32 loadPal);
void SetCurrentBoxMonData(u8 boxPosition, s32 request, const void *value); void SetCurrentBoxMonData(u8 boxPosition, s32 request, const void *value);
u32 GetCurrentBoxMonData(u8 boxPosition, s32 request); u32 GetCurrentBoxMonData(u8 boxPosition, s32 request);
u32 GetAndCopyBoxMonDataAt(u8 boxId, u8 boxPosition, s32 request, void *dst); u32 GetAndCopyBoxMonDataAt(u8 boxId, u8 boxPosition, s32 request, void *dst);
@@ -430,16 +436,16 @@ bool8 sub_8095050(void);
void sub_80950A4(void); void sub_80950A4(void);
void sub_80950BC(u8 a0); void sub_80950BC(u8 a0);
bool8 sub_80950D0(void); bool8 sub_80950D0(void);
void sub_8095B5C(void); void CreateItemIconSprites(void);
void sub_8096088(void); void sub_8096088(void);
void sub_80960C0(void); void sub_80960C0(void);
bool8 sub_809610C(void); bool8 sub_809610C(void);
const u8 *GetMovingItemName(void); const u8 *GetMovingItemName(void);
void sub_80966F4(void); void InitItemInfoWindow(void);
bool8 sub_8096728(void); bool8 UpdateItemInfoWindowSlideIn(void);
bool8 sub_80967C0(void); bool8 UpdateItemInfoWindowSlideOut(void);
void sub_8096BE4(struct UnkStruct_2000020 *arg0, struct UnkStruct_2000028 *arg1, u32 arg2); void UnkUtil_Init(struct UnkUtil *arg0, struct UnkUtilData *arg1, u32 arg2);
void sub_8096BF8(void); void UnkUtil_Run(void);
void AddMenu(void); void AddMenu(void);
bool8 CanMovePartyMon(void); bool8 CanMovePartyMon(void);
bool8 CanShiftMon(void); bool8 CanShiftMon(void);
@@ -471,11 +477,11 @@ void SetMenuText(u8 textId);
void sub_8095C84(u8 cursorArea, u8 cursorPos); void sub_8095C84(u8 cursorArea, u8 cursorPos);
void sub_8095E2C(u16 itemId); void sub_8095E2C(u16 itemId);
u8 GetBoxWallpaper(u8 boxId); u8 GetBoxWallpaper(u8 boxId);
bool8 IsCursorOnBox(void); bool8 IsCursorOnBoxTitle(void);
bool8 IsCursorInBox(void); bool8 IsCursorInBox(void);
void sub_808FFAC(void); void sub_808FFAC(void);
struct Sprite * CreateMonIconSprite(u16 species, u32 pid, s16 x, s16 y, u8 priority, u8 subpriority); struct Sprite *CreateMonIconSprite(u16 species, u32 pid, s16 x, s16 y, u8 priority, u8 subpriority);
void CreatePartyMonsSprites(bool8 species); void CreatePartyMonsSprites(bool8 species);
void sub_80909F4(void); void sub_80909F4(void);
bool8 sub_8090A60(void); bool8 sub_8090A60(void);
@@ -485,7 +491,7 @@ void sub_8091114(void);
bool8 sub_8091150(void); bool8 sub_8091150(void);
void sub_80913DC(u8 box); void sub_80913DC(u8 box);
bool8 sub_809140C(void); bool8 sub_809140C(void);
void sub_80920FC(bool8 species); void AnimateBoxScrollArrows(bool8 species);
void CreateMovingMonIcon(void); void CreateMovingMonIcon(void);
void sub_8090E08(u8 boxId, u8 cursorPos); void sub_8090E08(u8 boxId, u8 cursorPos);
bool8 sub_8090E74(void); bool8 sub_8090E74(void);
include/quest_log.h
+1 -1
View File
@@ -85,7 +85,7 @@ void sub_81113E4(void);
void sub_8111438(void); void sub_8111438(void);
void StartRecordingQuestLogEntry(u16 eventId); void StartRecordingQuestLogEntry(u16 eventId);
bool8 WillCommandOfSizeFitInSav1Record(u16 *cursor, size_t size); bool8 WillCommandOfSizeFitInSav1Record(u16 *cursor, size_t size);
bool8 sub_8110944(const void * a0, size_t cmdSize); bool8 sub_8110944(const void *a0, size_t cmdSize);
void sub_8113BD8(void); void sub_8113BD8(void);
void ResetUnk203B044(void); void ResetUnk203B044(void);
include/shop.h
+1 -1
View File
@@ -11,7 +11,7 @@ extern EWRAM_DATA struct ItemSlot gUnknown_02039F80[3];
void CreatePokemartMenu(const u16 *itemsForSale); void CreatePokemartMenu(const u16 *itemsForSale);
void CreateDecorationShop1Menu(const u16 *); void CreateDecorationShop1Menu(const u16 *);
void CreateDecorationShop2Menu(const u16 *); void CreateDecorationShop2Menu(const u16 *);
u8 GetMartUnk16_4(void); u8 GetMartFontId(void);
void RecordItemPurchase(u16 a0, u16 a1, u8 a2); void RecordItemPurchase(u16 a0, u16 a1, u8 a2);
// buy_menu_helper // buy_menu_helper
include/sound.h
+4 -6
View File
@@ -25,12 +25,10 @@ void FadeInBGM(u8 speed);
void FadeOutBGM(u8 speed); void FadeOutBGM(u8 speed);
bool8 IsBGMStopped(void); bool8 IsBGMStopped(void);
void PlayCry_Normal(u16 species, s8 pan); void PlayCry_Normal(u16 species, s8 pan);
void PlayCry2(u16 species, s8 pan, s8 volume, u8 priority); void PlayCry_NormalNoDucking(u16 species, s8 pan, s8 volume, u8 priority);
void PlayCry3(u16 species, s8 pan, u8 mode); void PlayCry_ByMode(u16 species, s8 pan, u8 mode);
void PlayCry4(u16 species, s8 pan, u8 mode); void PlayCry_ReleaseDouble(u16 species, s8 pan, u8 mode);
void PlayCry5(u16 species, u8 mode); void PlayCry_Script(u16 species, u8 mode);
void PlayCry6(u16 species, s8 pan, u8 mode);
void PlayCry7(u16 species, u8 mode);
void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode); void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode);
bool8 IsCryFinished(void); bool8 IsCryFinished(void);
void StopCryAndClearCrySongs(void); void StopCryAndClearCrySongs(void);
include/sprite.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "global.h" #include "global.h"
#define MAX_SPRITES 64 #define MAX_SPRITES 64
#define SPRITE_INVALID_TAG 0xFFFF #define TAG_NONE 0xFFFF
struct SpriteSheet struct SpriteSheet
{ {
include/text.h
+13 -1
View File
@@ -157,8 +157,21 @@
#define NUM_TEXT_PRINTERS 32 #define NUM_TEXT_PRINTERS 32
#define TEXT_SPEED_INSTANT 0 #define TEXT_SPEED_INSTANT 0
// Given as a text speed when all the text should be
// loaded at once but not copied to vram yet.
#define TEXT_SKIP_DRAW 0xFF #define TEXT_SKIP_DRAW 0xFF
enum {
FONT_0,
FONT_1,
FONT_2,
FONT_3,
FONT_4,
FONT_5,
FONT_6,
};
enum enum
{ {
FONTATTR_MAX_LETTER_WIDTH, FONTATTR_MAX_LETTER_WIDTH,
@@ -302,7 +315,6 @@ bool16 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter);
bool16 TextPrinterWait(struct TextPrinter *textPrinter); bool16 TextPrinterWait(struct TextPrinter *textPrinter);
void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *counter, u8 *yCoordIndex); void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *counter, u8 *yCoordIndex);
u16 RenderText(struct TextPrinter *textPrinter); u16 RenderText(struct TextPrinter *textPrinter);
s32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing);
s32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32); s32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32);
s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing); s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing);
u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str, int a3, int a4, int a5, int a6, int a7); u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str, int a3, int a4, int a5, int a6, int a7);
include/text_window_graphics.h
+3 -3
View File
@@ -3,8 +3,8 @@
struct TextWindowGraphics struct TextWindowGraphics
{ {
const void * tiles; const void *tiles;
const void * palette; const void *palette;
}; };
extern const u16 gUnknown_8470B0C[]; extern const u16 gUnknown_8470B0C[];
@@ -14,6 +14,6 @@ extern const u16 gUnknown_8471DEC[][16];
extern const struct TextWindowGraphics gUserFrames[]; extern const struct TextWindowGraphics gUserFrames[];
const struct TextWindowGraphics * GetUserFrameGraphicsInfo(u8 idx); const struct TextWindowGraphics *GetWindowFrameTilesPal(u8 idx);
#endif //GUARD_TEXT_WINDOW_GRAPHICS_H #endif //GUARD_TEXT_WINDOW_GRAPHICS_H
ld_script.txt
-1
View File
@@ -137,7 +137,6 @@ SECTIONS {
src/pokemon_storage_system_6.o(.text); src/pokemon_storage_system_6.o(.text);
src/pokemon_storage_system_7.o(.text); src/pokemon_storage_system_7.o(.text);
src/pokemon_storage_system_8.o(.text); src/pokemon_storage_system_8.o(.text);
src/pokemon_storage_system_9.o(.text);
src/pokemon_icon.o(.text); src/pokemon_icon.o(.text);
src/script_movement.o(.text); src/script_movement.o(.text);
src/fldeff_cut.o(.text); src/fldeff_cut.o(.text);
sound/voice_groups.inc
+389 -389
View File
@@ -1383,395 +1383,395 @@ gCryTable::
cry Cry_Deoxys cry Cry_Deoxys
cry Cry_Chimecho cry Cry_Chimecho
gCryTable2:: gCryTable_Reverse::
cry2 Cry_Bulbasaur cry_reverse Cry_Bulbasaur
cry2 Cry_Ivysaur cry_reverse Cry_Ivysaur
cry2 Cry_Venusaur cry_reverse Cry_Venusaur
cry2 Cry_Charmander cry_reverse Cry_Charmander
cry2 Cry_Charmeleon cry_reverse Cry_Charmeleon
cry2 Cry_Charizard cry_reverse Cry_Charizard
cry2 Cry_Squirtle cry_reverse Cry_Squirtle
cry2 Cry_Wartortle cry_reverse Cry_Wartortle
cry2 Cry_Blastoise cry_reverse Cry_Blastoise
cry2 Cry_Caterpie cry_reverse Cry_Caterpie
cry2 Cry_Metapod cry_reverse Cry_Metapod
cry2 Cry_Butterfree cry_reverse Cry_Butterfree
cry2 Cry_Weedle cry_reverse Cry_Weedle
cry2 Cry_Kakuna cry_reverse Cry_Kakuna
cry2 Cry_Beedrill cry_reverse Cry_Beedrill
cry2 Cry_Pidgey cry_reverse Cry_Pidgey
cry2 Cry_Pidgeotto cry_reverse Cry_Pidgeotto
cry2 Cry_Pidgeot cry_reverse Cry_Pidgeot
cry2 Cry_Rattata cry_reverse Cry_Rattata
cry2 Cry_Raticate cry_reverse Cry_Raticate
cry2 Cry_Spearow cry_reverse Cry_Spearow
cry2 Cry_Fearow cry_reverse Cry_Fearow
cry2 Cry_Ekans cry_reverse Cry_Ekans
cry2 Cry_Arbok cry_reverse Cry_Arbok
cry2 Cry_Pikachu cry_reverse Cry_Pikachu
cry2 Cry_Raichu cry_reverse Cry_Raichu
cry2 Cry_Sandshrew cry_reverse Cry_Sandshrew
cry2 Cry_Sandslash cry_reverse Cry_Sandslash
cry2 Cry_NidoranF cry_reverse Cry_NidoranF
cry2 Cry_Nidorina cry_reverse Cry_Nidorina
cry2 Cry_Nidoqueen cry_reverse Cry_Nidoqueen
cry2 Cry_NidoranM cry_reverse Cry_NidoranM
cry2 Cry_Nidorino cry_reverse Cry_Nidorino
cry2 Cry_Nidoking cry_reverse Cry_Nidoking
cry2 Cry_Clefairy cry_reverse Cry_Clefairy
cry2 Cry_Clefable cry_reverse Cry_Clefable
cry2 Cry_Vulpix cry_reverse Cry_Vulpix
cry2 Cry_Ninetales cry_reverse Cry_Ninetales
cry2 Cry_Jigglypuff cry_reverse Cry_Jigglypuff
cry2 Cry_Wigglytuff cry_reverse Cry_Wigglytuff
cry2 Cry_Zubat cry_reverse Cry_Zubat
cry2 Cry_Golbat cry_reverse Cry_Golbat
cry2 Cry_Oddish cry_reverse Cry_Oddish
cry2 Cry_Gloom cry_reverse Cry_Gloom
cry2 Cry_Vileplume cry_reverse Cry_Vileplume
cry2 Cry_Paras cry_reverse Cry_Paras
cry2 Cry_Parasect cry_reverse Cry_Parasect
cry2 Cry_Venonat cry_reverse Cry_Venonat
cry2 Cry_Venomoth cry_reverse Cry_Venomoth
cry2 Cry_Diglett cry_reverse Cry_Diglett
cry2 Cry_Dugtrio cry_reverse Cry_Dugtrio
cry2 Cry_Meowth cry_reverse Cry_Meowth
cry2 Cry_Persian cry_reverse Cry_Persian
cry2 Cry_Psyduck cry_reverse Cry_Psyduck
cry2 Cry_Golduck cry_reverse Cry_Golduck
cry2 Cry_Mankey cry_reverse Cry_Mankey
cry2 Cry_Primeape cry_reverse Cry_Primeape
cry2 Cry_Growlithe cry_reverse Cry_Growlithe
cry2 Cry_Arcanine cry_reverse Cry_Arcanine
cry2 Cry_Poliwag cry_reverse Cry_Poliwag
cry2 Cry_Poliwhirl cry_reverse Cry_Poliwhirl
cry2 Cry_Poliwrath cry_reverse Cry_Poliwrath
cry2 Cry_Abra cry_reverse Cry_Abra
cry2 Cry_Kadabra cry_reverse Cry_Kadabra
cry2 Cry_Alakazam cry_reverse Cry_Alakazam
cry2 Cry_Machop cry_reverse Cry_Machop
cry2 Cry_Machoke cry_reverse Cry_Machoke
cry2 Cry_Machamp cry_reverse Cry_Machamp
cry2 Cry_Bellsprout cry_reverse Cry_Bellsprout
cry2 Cry_Weepinbell cry_reverse Cry_Weepinbell
cry2 Cry_Victreebel cry_reverse Cry_Victreebel
cry2 Cry_Tentacool cry_reverse Cry_Tentacool
cry2 Cry_Tentacruel cry_reverse Cry_Tentacruel
cry2 Cry_Geodude cry_reverse Cry_Geodude
cry2 Cry_Graveler cry_reverse Cry_Graveler
cry2 Cry_Golem cry_reverse Cry_Golem
cry2 Cry_Ponyta cry_reverse Cry_Ponyta
cry2 Cry_Rapidash cry_reverse Cry_Rapidash
cry2 Cry_Slowpoke cry_reverse Cry_Slowpoke
cry2 Cry_Slowbro cry_reverse Cry_Slowbro
cry2 Cry_Magnemite cry_reverse Cry_Magnemite
cry2 Cry_Magneton cry_reverse Cry_Magneton
cry2 Cry_Farfetchd cry_reverse Cry_Farfetchd
cry2 Cry_Doduo cry_reverse Cry_Doduo
cry2 Cry_Dodrio cry_reverse Cry_Dodrio
cry2 Cry_Seel cry_reverse Cry_Seel
cry2 Cry_Dewgong cry_reverse Cry_Dewgong
cry2 Cry_Grimer cry_reverse Cry_Grimer
cry2 Cry_Muk cry_reverse Cry_Muk
cry2 Cry_Shellder cry_reverse Cry_Shellder
cry2 Cry_Cloyster cry_reverse Cry_Cloyster
cry2 Cry_Gastly cry_reverse Cry_Gastly
cry2 Cry_Haunter cry_reverse Cry_Haunter
cry2 Cry_Gengar cry_reverse Cry_Gengar
cry2 Cry_Onix cry_reverse Cry_Onix
cry2 Cry_Drowzee cry_reverse Cry_Drowzee
cry2 Cry_Hypno cry_reverse Cry_Hypno
cry2 Cry_Krabby cry_reverse Cry_Krabby
cry2 Cry_Kingler cry_reverse Cry_Kingler
cry2 Cry_Voltorb cry_reverse Cry_Voltorb
cry2 Cry_Electrode cry_reverse Cry_Electrode
cry2 Cry_Exeggcute cry_reverse Cry_Exeggcute
cry2 Cry_Exeggutor cry_reverse Cry_Exeggutor
cry2 Cry_Cubone cry_reverse Cry_Cubone
cry2 Cry_Marowak cry_reverse Cry_Marowak
cry2 Cry_Hitmonlee cry_reverse Cry_Hitmonlee
cry2 Cry_Hitmonchan cry_reverse Cry_Hitmonchan
cry2 Cry_Lickitung cry_reverse Cry_Lickitung
cry2 Cry_Koffing cry_reverse Cry_Koffing
cry2 Cry_Weezing cry_reverse Cry_Weezing
cry2 Cry_Rhyhorn cry_reverse Cry_Rhyhorn
cry2 Cry_Rhydon cry_reverse Cry_Rhydon
cry2 Cry_Chansey cry_reverse Cry_Chansey
cry2 Cry_Tangela cry_reverse Cry_Tangela
cry2 Cry_Kangaskhan cry_reverse Cry_Kangaskhan
cry2 Cry_Horsea cry_reverse Cry_Horsea
cry2 Cry_Seadra cry_reverse Cry_Seadra
cry2 Cry_Goldeen cry_reverse Cry_Goldeen
cry2 Cry_Seaking cry_reverse Cry_Seaking
cry2 Cry_Staryu cry_reverse Cry_Staryu
cry2 Cry_Starmie cry_reverse Cry_Starmie
cry2 Cry_MrMime cry_reverse Cry_MrMime
cry2 Cry_Scyther cry_reverse Cry_Scyther
cry2 Cry_Jynx cry_reverse Cry_Jynx
cry2 Cry_Electabuzz cry_reverse Cry_Electabuzz
cry2 Cry_Magmar cry_reverse Cry_Magmar
cry2 Cry_Pinsir cry_reverse Cry_Pinsir
cry2 Cry_Tauros cry_reverse Cry_Tauros
cry2 Cry_Magikarp cry_reverse Cry_Magikarp
cry2 Cry_Gyarados cry_reverse Cry_Gyarados
cry2 Cry_Lapras cry_reverse Cry_Lapras
cry2 Cry_Ditto cry_reverse Cry_Ditto
cry2 Cry_Eevee cry_reverse Cry_Eevee
cry2 Cry_Vaporeon cry_reverse Cry_Vaporeon
cry2 Cry_Jolteon cry_reverse Cry_Jolteon
cry2 Cry_Flareon cry_reverse Cry_Flareon
cry2 Cry_Porygon cry_reverse Cry_Porygon
cry2 Cry_Omanyte cry_reverse Cry_Omanyte
cry2 Cry_Omastar cry_reverse Cry_Omastar
cry2 Cry_Kabuto cry_reverse Cry_Kabuto
cry2 Cry_Kabutops cry_reverse Cry_Kabutops
cry2 Cry_Aerodactyl cry_reverse Cry_Aerodactyl
cry2 Cry_Snorlax cry_reverse Cry_Snorlax
cry2 Cry_Articuno cry_reverse Cry_Articuno
cry2 Cry_Zapdos cry_reverse Cry_Zapdos
cry2 Cry_Moltres cry_reverse Cry_Moltres
cry2 Cry_Dratini cry_reverse Cry_Dratini
cry2 Cry_Dragonair cry_reverse Cry_Dragonair
cry2 Cry_Dragonite cry_reverse Cry_Dragonite
cry2 Cry_Mewtwo cry_reverse Cry_Mewtwo
cry2 Cry_Mew cry_reverse Cry_Mew
cry2 Cry_Chikorita cry_reverse Cry_Chikorita
cry2 Cry_Bayleef cry_reverse Cry_Bayleef
cry2 Cry_Meganium cry_reverse Cry_Meganium
cry2 Cry_Cyndaquil cry_reverse Cry_Cyndaquil
cry2 Cry_Quilava cry_reverse Cry_Quilava
cry2 Cry_Typhlosion cry_reverse Cry_Typhlosion
cry2 Cry_Totodile cry_reverse Cry_Totodile
cry2 Cry_Croconaw cry_reverse Cry_Croconaw
cry2 Cry_Feraligatr cry_reverse Cry_Feraligatr
cry2 Cry_Sentret cry_reverse Cry_Sentret
cry2 Cry_Furret cry_reverse Cry_Furret
cry2 Cry_Hoothoot cry_reverse Cry_Hoothoot
cry2 Cry_Noctowl cry_reverse Cry_Noctowl
cry2 Cry_Ledyba cry_reverse Cry_Ledyba
cry2 Cry_Ledian cry_reverse Cry_Ledian
cry2 Cry_Spinarak cry_reverse Cry_Spinarak
cry2 Cry_Ariados cry_reverse Cry_Ariados
cry2 Cry_Crobat cry_reverse Cry_Crobat
cry2 Cry_Chinchou cry_reverse Cry_Chinchou
cry2 Cry_Lanturn cry_reverse Cry_Lanturn
cry2 Cry_Pichu cry_reverse Cry_Pichu
cry2 Cry_Cleffa cry_reverse Cry_Cleffa
cry2 Cry_Igglybuff cry_reverse Cry_Igglybuff
cry2 Cry_Togepi cry_reverse Cry_Togepi
cry2 Cry_Togetic cry_reverse Cry_Togetic
cry2 Cry_Natu cry_reverse Cry_Natu
cry2 Cry_Xatu cry_reverse Cry_Xatu
cry2 Cry_Mareep cry_reverse Cry_Mareep
cry2 Cry_Flaaffy cry_reverse Cry_Flaaffy
cry2 Cry_Ampharos cry_reverse Cry_Ampharos
cry2 Cry_Bellossom cry_reverse Cry_Bellossom
cry2 Cry_Marill cry_reverse Cry_Marill
cry2 Cry_Azumarill cry_reverse Cry_Azumarill
cry2 Cry_Sudowoodo cry_reverse Cry_Sudowoodo
cry2 Cry_Politoed cry_reverse Cry_Politoed
cry2 Cry_Hoppip cry_reverse Cry_Hoppip
cry2 Cry_Skiploom cry_reverse Cry_Skiploom
cry2 Cry_Jumpluff cry_reverse Cry_Jumpluff
cry2 Cry_Aipom cry_reverse Cry_Aipom
cry2 Cry_Sunkern cry_reverse Cry_Sunkern
cry2 Cry_Sunflora cry_reverse Cry_Sunflora
cry2 Cry_Yanma cry_reverse Cry_Yanma
cry2 Cry_Wooper cry_reverse Cry_Wooper
cry2 Cry_Quagsire cry_reverse Cry_Quagsire
cry2 Cry_Espeon cry_reverse Cry_Espeon
cry2 Cry_Umbreon cry_reverse Cry_Umbreon
cry2 Cry_Murkrow cry_reverse Cry_Murkrow
cry2 Cry_Slowking cry_reverse Cry_Slowking
cry2 Cry_Misdreavus cry_reverse Cry_Misdreavus
cry2 Cry_Unown cry_reverse Cry_Unown
cry2 Cry_Wobbuffet cry_reverse Cry_Wobbuffet
cry2 Cry_Girafarig cry_reverse Cry_Girafarig
cry2 Cry_Pineco cry_reverse Cry_Pineco
cry2 Cry_Forretress cry_reverse Cry_Forretress
cry2 Cry_Dunsparce cry_reverse Cry_Dunsparce
cry2 Cry_Gligar cry_reverse Cry_Gligar
cry2 Cry_Steelix cry_reverse Cry_Steelix
cry2 Cry_Snubbull cry_reverse Cry_Snubbull
cry2 Cry_Granbull cry_reverse Cry_Granbull
cry2 Cry_Qwilfish cry_reverse Cry_Qwilfish
cry2 Cry_Scizor cry_reverse Cry_Scizor
cry2 Cry_Shuckle cry_reverse Cry_Shuckle
cry2 Cry_Heracross cry_reverse Cry_Heracross
cry2 Cry_Sneasel cry_reverse Cry_Sneasel
cry2 Cry_Teddiursa cry_reverse Cry_Teddiursa
cry2 Cry_Ursaring cry_reverse Cry_Ursaring
cry2 Cry_Slugma cry_reverse Cry_Slugma
cry2 Cry_Magcargo cry_reverse Cry_Magcargo
cry2 Cry_Swinub cry_reverse Cry_Swinub
cry2 Cry_Piloswine cry_reverse Cry_Piloswine
cry2 Cry_Corsola cry_reverse Cry_Corsola
cry2 Cry_Remoraid cry_reverse Cry_Remoraid
cry2 Cry_Octillery cry_reverse Cry_Octillery
cry2 Cry_Delibird cry_reverse Cry_Delibird
cry2 Cry_Mantine cry_reverse Cry_Mantine
cry2 Cry_Skarmory cry_reverse Cry_Skarmory
cry2 Cry_Houndour cry_reverse Cry_Houndour
cry2 Cry_Houndoom cry_reverse Cry_Houndoom
cry2 Cry_Kingdra cry_reverse Cry_Kingdra
cry2 Cry_Phanpy cry_reverse Cry_Phanpy
cry2 Cry_Donphan cry_reverse Cry_Donphan
cry2 Cry_Porygon2 cry_reverse Cry_Porygon2
cry2 Cry_Stantler cry_reverse Cry_Stantler
cry2 Cry_Smeargle cry_reverse Cry_Smeargle
cry2 Cry_Tyrogue cry_reverse Cry_Tyrogue
cry2 Cry_Hitmontop cry_reverse Cry_Hitmontop
cry2 Cry_Smoochum cry_reverse Cry_Smoochum
cry2 Cry_Elekid cry_reverse Cry_Elekid
cry2 Cry_Magby cry_reverse Cry_Magby
cry2 Cry_Miltank cry_reverse Cry_Miltank
cry2 Cry_Blissey cry_reverse Cry_Blissey
cry2 Cry_Raikou cry_reverse Cry_Raikou
cry2 Cry_Entei cry_reverse Cry_Entei
cry2 Cry_Suicune cry_reverse Cry_Suicune
cry2 Cry_Larvitar cry_reverse Cry_Larvitar
cry2 Cry_Pupitar cry_reverse Cry_Pupitar
cry2 Cry_Tyranitar cry_reverse Cry_Tyranitar
cry2 Cry_Lugia cry_reverse Cry_Lugia
cry2 Cry_HoOh cry_reverse Cry_HoOh
cry2 Cry_Celebi cry_reverse Cry_Celebi
cry2 Cry_Kecleon cry_reverse Cry_Kecleon
cry2 Cry_Roselia cry_reverse Cry_Roselia
cry2 Cry_Torkoal cry_reverse Cry_Torkoal
cry2 Cry_Electrike cry_reverse Cry_Electrike
cry2 Cry_Manectric cry_reverse Cry_Manectric
cry2 Cry_Duskull cry_reverse Cry_Duskull
cry2 Cry_Latias cry_reverse Cry_Latias
cry2 Cry_Wynaut cry_reverse Cry_Wynaut
cry2 Cry_Seviper cry_reverse Cry_Seviper
cry2 Cry_Sharpedo cry_reverse Cry_Sharpedo
cry2 Cry_Zangoose cry_reverse Cry_Zangoose
cry2 Cry_Azurill cry_reverse Cry_Azurill
cry2 Cry_Swablu cry_reverse Cry_Swablu
cry2 Cry_Altaria cry_reverse Cry_Altaria
cry2 Cry_Unused265 cry_reverse Cry_Unused265
cry2 Cry_Taillow cry_reverse Cry_Taillow
cry2 Cry_Swellow cry_reverse Cry_Swellow
cry2 Cry_Unused268 cry_reverse Cry_Unused268
cry2 Cry_Spinda cry_reverse Cry_Spinda
cry2 Cry_Torchic cry_reverse Cry_Torchic
cry2 Cry_Combusken cry_reverse Cry_Combusken
cry2 Cry_Blaziken cry_reverse Cry_Blaziken
cry2 Cry_Treecko cry_reverse Cry_Treecko
cry2 Cry_Grovyle cry_reverse Cry_Grovyle
cry2 Cry_Sceptile cry_reverse Cry_Sceptile
cry2 Cry_Mudkip cry_reverse Cry_Mudkip
cry2 Cry_Marshtomp cry_reverse Cry_Marshtomp
cry2 Cry_Swampert cry_reverse Cry_Swampert
cry2 Cry_Pelipper cry_reverse Cry_Pelipper
cry2 Cry_Wingull cry_reverse Cry_Wingull
cry2 Cry_Banette cry_reverse Cry_Banette
cry2 Cry_Shuppet cry_reverse Cry_Shuppet
cry2 Cry_Lotad cry_reverse Cry_Lotad
cry2 Cry_Lombre cry_reverse Cry_Lombre
cry2 Cry_Ludicolo cry_reverse Cry_Ludicolo
cry2 Cry_Seedot cry_reverse Cry_Seedot
cry2 Cry_Nuzleaf cry_reverse Cry_Nuzleaf
cry2 Cry_Shiftry cry_reverse Cry_Shiftry
cry2 Cry_Carvanha cry_reverse Cry_Carvanha
cry2 Cry_Wurmple cry_reverse Cry_Wurmple
cry2 Cry_Silcoon cry_reverse Cry_Silcoon
cry2 Cry_Beautifly cry_reverse Cry_Beautifly
cry2 Cry_Cascoon cry_reverse Cry_Cascoon
cry2 Cry_Dustox cry_reverse Cry_Dustox
cry2 Cry_Ralts cry_reverse Cry_Ralts
cry2 Cry_Kirlia cry_reverse Cry_Kirlia
cry2 Cry_Gardevoir cry_reverse Cry_Gardevoir
cry2 Cry_Slakoth cry_reverse Cry_Slakoth
cry2 Cry_Vigoroth cry_reverse Cry_Vigoroth
cry2 Cry_Slaking cry_reverse Cry_Slaking
cry2 Cry_Nincada cry_reverse Cry_Nincada
cry2 Cry_Ninjask cry_reverse Cry_Ninjask
cry2 Cry_Shedinja cry_reverse Cry_Shedinja
cry2 Cry_Makuhita cry_reverse Cry_Makuhita
cry2 Cry_Hariyama cry_reverse Cry_Hariyama
cry2 Cry_Nosepass cry_reverse Cry_Nosepass
cry2 Cry_Glalie cry_reverse Cry_Glalie
cry2 Cry_Plusle cry_reverse Cry_Plusle
cry2 Cry_Minun cry_reverse Cry_Minun
cry2 Cry_Surskit cry_reverse Cry_Surskit
cry2 Cry_Masquerain cry_reverse Cry_Masquerain
cry2 Cry_Skitty cry_reverse Cry_Skitty
cry2 Cry_Delcatty cry_reverse Cry_Delcatty
cry2 Cry_Gulpin cry_reverse Cry_Gulpin
cry2 Cry_Swalot cry_reverse Cry_Swalot
cry2 Cry_Numel cry_reverse Cry_Numel
cry2 Cry_Camerupt cry_reverse Cry_Camerupt
cry2 Cry_Barboach cry_reverse Cry_Barboach
cry2 Cry_Whiscash cry_reverse Cry_Whiscash
cry2 Cry_Corphish cry_reverse Cry_Corphish
cry2 Cry_Crawdaunt cry_reverse Cry_Crawdaunt
cry2 Cry_Spoink cry_reverse Cry_Spoink
cry2 Cry_Grumpig cry_reverse Cry_Grumpig
cry2 Cry_Trapinch cry_reverse Cry_Trapinch
cry2 Cry_Vibrava cry_reverse Cry_Vibrava
cry2 Cry_Flygon cry_reverse Cry_Flygon
cry2 Cry_Cacnea cry_reverse Cry_Cacnea
cry2 Cry_Cacturne cry_reverse Cry_Cacturne
cry2 Cry_Baltoy cry_reverse Cry_Baltoy
cry2 Cry_Claydol cry_reverse Cry_Claydol
cry2 Cry_Lunatone cry_reverse Cry_Lunatone
cry2 Cry_Solrock cry_reverse Cry_Solrock
cry2 Cry_Feebas cry_reverse Cry_Feebas
cry2 Cry_Milotic cry_reverse Cry_Milotic
cry2 Cry_Absol cry_reverse Cry_Absol
cry2 Cry_Meditite cry_reverse Cry_Meditite
cry2 Cry_Medicham cry_reverse Cry_Medicham
cry2 Cry_Spheal cry_reverse Cry_Spheal
cry2 Cry_Sealeo cry_reverse Cry_Sealeo
cry2 Cry_Walrein cry_reverse Cry_Walrein
cry2 Cry_Clamperl cry_reverse Cry_Clamperl
cry2 Cry_Huntail cry_reverse Cry_Huntail
cry2 Cry_Gorebyss cry_reverse Cry_Gorebyss
cry2 Cry_Lileep cry_reverse Cry_Lileep
cry2 Cry_Cradily cry_reverse Cry_Cradily
cry2 Cry_Anorith cry_reverse Cry_Anorith
cry2 Cry_Armaldo cry_reverse Cry_Armaldo
cry2 Cry_Beldum cry_reverse Cry_Beldum
cry2 Cry_Metang cry_reverse Cry_Metang
cry2 Cry_Metagross cry_reverse Cry_Metagross
cry2 Cry_Bagon cry_reverse Cry_Bagon
cry2 Cry_Shelgon cry_reverse Cry_Shelgon
cry2 Cry_Regirock cry_reverse Cry_Regirock
cry2 Cry_Regice cry_reverse Cry_Regice
cry2 Cry_Registeel cry_reverse Cry_Registeel
cry2 Cry_Castform cry_reverse Cry_Castform
cry2 Cry_Volbeat cry_reverse Cry_Volbeat
cry2 Cry_Illumise cry_reverse Cry_Illumise
cry2 Cry_Poochyena cry_reverse Cry_Poochyena
cry2 Cry_Mightyena cry_reverse Cry_Mightyena
cry2 Cry_Dusclops cry_reverse Cry_Dusclops
cry2 Cry_Sableye cry_reverse Cry_Sableye
cry2 Cry_Mawile cry_reverse Cry_Mawile
cry2 Cry_Aron cry_reverse Cry_Aron
cry2 Cry_Lairon cry_reverse Cry_Lairon
cry2 Cry_Aggron cry_reverse Cry_Aggron
cry2 Cry_Relicanth cry_reverse Cry_Relicanth
cry2 Cry_Luvdisc cry_reverse Cry_Luvdisc
cry2 Cry_Groudon cry_reverse Cry_Groudon
cry2 Cry_Kyogre cry_reverse Cry_Kyogre
cry2 Cry_Rayquaza cry_reverse Cry_Rayquaza
cry2 Cry_Salamence cry_reverse Cry_Salamence
cry2 Cry_Breloom cry_reverse Cry_Breloom
cry2 Cry_Shroomish cry_reverse Cry_Shroomish
cry2 Cry_Linoone cry_reverse Cry_Linoone
cry2 Cry_Tropius cry_reverse Cry_Tropius
cry2 Cry_Wailmer cry_reverse Cry_Wailmer
cry2 Cry_Zigzagoon cry_reverse Cry_Zigzagoon
cry2 Cry_Exploud cry_reverse Cry_Exploud
cry2 Cry_Loudred cry_reverse Cry_Loudred
cry2 Cry_Wailord cry_reverse Cry_Wailord
cry2 Cry_Whismur cry_reverse Cry_Whismur
cry2 Cry_Snorunt cry_reverse Cry_Snorunt
cry2 Cry_Latios cry_reverse Cry_Latios
cry2 Cry_Jirachi cry_reverse Cry_Jirachi
cry2 Cry_Deoxys cry_reverse Cry_Deoxys
cry2 Cry_Chimecho cry_reverse Cry_Chimecho
.align 2 .align 2
voicegroup129:: voicegroup129::
src/AgbRfu_LinkManager.c
+1 -1
View File
@@ -918,7 +918,7 @@ static void rfu_LMAN_REQ_callback(u16 reqCommandId, u16 reqResult)
{ {
lman.reserveDisconnectSlot_flag = 0; lman.reserveDisconnectSlot_flag = 0;
lman.acceptCount = 0; lman.acceptCount = 0;
lman.acceptSlot_flag = 0;; lman.acceptSlot_flag = 0;
lman.parent_child = MODE_NEUTRAL; lman.parent_child = MODE_NEUTRAL;
rfu_LMAN_managerChangeAgbClockMaster(); rfu_LMAN_managerChangeAgbClockMaster();
if (reqCommandId == ID_STOP_MODE_REQ) if (reqCommandId == ID_STOP_MODE_REQ)
src/bag.c
+6 -6
View File
@@ -225,16 +225,16 @@ void BagPrintTextOnWindow(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8
void BagPrintTextOnWin1CenteredColor0(const u8 * str, u8 unused) void BagPrintTextOnWin1CenteredColor0(const u8 * str, u8 unused)
{ {
u32 x = 0x48 - GetStringWidth(1, str, 0); u32 x = 0x48 - GetStringWidth(FONT_1, str, 0);
AddTextPrinterParameterized3(2, 1, x / 2, 1, sTextColors[0], 0, str); AddTextPrinterParameterized3(2, FONT_1, x / 2, 1, sTextColors[0], 0, str);
} }
void BagDrawDepositItemTextBox(void) void BagDrawDepositItemTextBox(void)
{ {
u32 x; u32 x;
DrawStdFrameWithCustomTileAndPalette(2, FALSE, 0x081, 0x0C); DrawStdFrameWithCustomTileAndPalette(2, FALSE, 0x081, 0x0C);
x = 0x40 - GetStringWidth(0, gText_DepositItem, 0); x = 0x40 - GetStringWidth(FONT_0, gText_DepositItem, 0);
AddTextPrinterParameterized(2, 0, gText_DepositItem, x / 2, 1, 0, NULL); AddTextPrinterParameterized(2, FONT_0, gText_DepositItem, x / 2, 1, 0, NULL);
} }
u8 ShowBagWindow(u8 whichWindow, u8 nItems) u8 ShowBagWindow(u8 whichWindow, u8 nItems)
@@ -293,12 +293,12 @@ u8 GetBagWindow(u8 whichWindow)
void BagCreateYesNoMenuBottomRight(u8 taskId, const struct YesNoFuncTable * ptrs) void BagCreateYesNoMenuBottomRight(u8 taskId, const struct YesNoFuncTable * ptrs)
{ {
CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates[3], 2, 0, 2, 0x064, 0x0E, ptrs); CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates[3], FONT_2, 0, 2, 0x064, 0x0E, ptrs);
} }
void BagCreateYesNoMenuTopRight(u8 taskId, const struct YesNoFuncTable * ptrs) void BagCreateYesNoMenuTopRight(u8 taskId, const struct YesNoFuncTable * ptrs)
{ {
CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates[4], 2, 0, 2, 0x064, 0x0E, ptrs); CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates[4], FONT_2, 0, 2, 0x064, 0x0E, ptrs);
} }
void BagPrintMoneyAmount(void) void BagPrintMoneyAmount(void)
src/battle_anim.c
+2 -2
View File
@@ -1857,7 +1857,7 @@ void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMo
{ {
if (tableId == gMovesWithQuietBGM[i]) if (tableId == gMovesWithQuietBGM[i])
{ {
m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 128); m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 128);
break; break;
} }
} }
@@ -2127,7 +2127,7 @@ static void ScriptCmd_end(void)
if (!continuousAnim) if (!continuousAnim)
{ {
m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256); m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 256);
ResetSpritePriorityOfAllVisibleBattlers(); ResetSpritePriorityOfAllVisibleBattlers();
UpdateOamPriorityInAllHealthboxes(1); UpdateOamPriorityInAllHealthboxes(1);
gAnimScriptActive = FALSE; gAnimScriptActive = FALSE;
src/battle_anim_mon_movement.c
+18 -18
View File
@@ -12,15 +12,15 @@ static void AnimTask_ShakeMon2Step(u8 taskId);
static void AnimTask_ShakeMonInPlaceStep(u8 taskId); static void AnimTask_ShakeMonInPlaceStep(u8 taskId);
static void AnimTask_ShakeAndSinkMonStep(u8 taskId); static void AnimTask_ShakeAndSinkMonStep(u8 taskId);
static void AnimTask_TranslateMonEllipticalStep(u8 taskId); static void AnimTask_TranslateMonEllipticalStep(u8 taskId);
static void DoHorizontalLunge(struct Sprite * sprite); static void DoHorizontalLunge(struct Sprite *sprite);
static void ReverseHorizontalLungeDirection(struct Sprite * sprite); static void ReverseHorizontalLungeDirection(struct Sprite *sprite);
static void DoVerticalDip(struct Sprite * sprite); static void DoVerticalDip(struct Sprite *sprite);
static void ReverseVerticalDipDirection(struct Sprite * sprite); static void ReverseVerticalDipDirection(struct Sprite *sprite);
static void SlideMonToOriginalPos(struct Sprite * sprite); static void SlideMonToOriginalPos(struct Sprite *sprite);
static void SlideMonToOriginalPosStep(struct Sprite * sprite); static void SlideMonToOriginalPosStep(struct Sprite *sprite);
static void SlideMonToOffset(struct Sprite * sprite); static void SlideMonToOffset(struct Sprite *sprite);
static void sub_8099394(struct Sprite * sprite); static void sub_8099394(struct Sprite *sprite);
static void sub_809946C(struct Sprite * sprite); static void sub_809946C(struct Sprite *sprite);
static void AnimTask_WindUpLungePart1(u8 taskId); static void AnimTask_WindUpLungePart1(u8 taskId);
static void AnimTask_WindUpLungePart2(u8 taskId); static void AnimTask_WindUpLungePart2(u8 taskId);
static void sub_80996B8(u8 taskId); static void sub_80996B8(u8 taskId);
@@ -383,7 +383,7 @@ void AnimTask_TranslateMonEllipticalRespectSide(u8 taskId)
// horizontally, and then moves back in the opposite direction. // horizontally, and then moves back in the opposite direction.
// arg 0: duration of single lunge direction // arg 0: duration of single lunge direction
// arg 1: x pixel delta that is applied each frame // arg 1: x pixel delta that is applied each frame
static void DoHorizontalLunge(struct Sprite * sprite) static void DoHorizontalLunge(struct Sprite *sprite)
{ {
sprite->invisible = TRUE; sprite->invisible = TRUE;
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
@@ -398,7 +398,7 @@ static void DoHorizontalLunge(struct Sprite * sprite)
sprite->callback = TranslateMonSpriteLinear; sprite->callback = TranslateMonSpriteLinear;
} }
static void ReverseHorizontalLungeDirection(struct Sprite * sprite) static void ReverseHorizontalLungeDirection(struct Sprite *sprite)
{ {
sprite->data[0] = sprite->data[4]; sprite->data[0] = sprite->data[4];
sprite->data[1] = -sprite->data[1]; sprite->data[1] = -sprite->data[1];
@@ -411,7 +411,7 @@ static void ReverseHorizontalLungeDirection(struct Sprite * sprite)
// arg 0: duration of single dip direction // arg 0: duration of single dip direction
// arg 1: y pixel delta that is applied each frame // arg 1: y pixel delta that is applied each frame
// arg 2: battler // arg 2: battler
static void DoVerticalDip(struct Sprite * sprite) static void DoVerticalDip(struct Sprite *sprite)
{ {
u8 spriteId; u8 spriteId;
sprite->invisible = TRUE; sprite->invisible = TRUE;
@@ -425,7 +425,7 @@ static void DoVerticalDip(struct Sprite * sprite)
sprite->callback = TranslateMonSpriteLinear; sprite->callback = TranslateMonSpriteLinear;
} }
static void ReverseVerticalDipDirection(struct Sprite * sprite) static void ReverseVerticalDipDirection(struct Sprite *sprite)
{ {
sprite->data[0] = sprite->data[4]; sprite->data[0] = sprite->data[4];
sprite->data[2] = -sprite->data[2]; sprite->data[2] = -sprite->data[2];
@@ -438,7 +438,7 @@ static void ReverseVerticalDipDirection(struct Sprite * sprite)
// arg 0: 1 = target or 0 = attacker // arg 0: 1 = target or 0 = attacker
// arg 1: direction (0 = horizontal and vertical, 1 = horizontal only, 2 = vertical only) // arg 1: direction (0 = horizontal and vertical, 1 = horizontal only, 2 = vertical only)
// arg 2: duration // arg 2: duration
static void SlideMonToOriginalPos(struct Sprite * sprite) static void SlideMonToOriginalPos(struct Sprite *sprite)
{ {
u8 spriteId; u8 spriteId;
if (gBattleAnimArgs[0] == 0) if (gBattleAnimArgs[0] == 0)
@@ -465,7 +465,7 @@ static void SlideMonToOriginalPos(struct Sprite * sprite)
sprite->callback = SlideMonToOriginalPosStep; sprite->callback = SlideMonToOriginalPosStep;
} }
static void SlideMonToOriginalPosStep(struct Sprite * sprite) static void SlideMonToOriginalPosStep(struct Sprite *sprite)
{ {
u8 data7 = sprite->data[7]; u8 data7 = sprite->data[7];
struct Sprite *otherSprite = &gSprites[sprite->data[7] >> 8]; struct Sprite *otherSprite = &gSprites[sprite->data[7] >> 8];
@@ -495,7 +495,7 @@ static void SlideMonToOriginalPosStep(struct Sprite * sprite)
// arg 2: target y pixel offset // arg 2: target y pixel offset
// arg 3: mirror vertical translation for opposite battle side // arg 3: mirror vertical translation for opposite battle side
// arg 4: duration // arg 4: duration
static void SlideMonToOffset(struct Sprite * sprite) static void SlideMonToOffset(struct Sprite *sprite)
{ {
u8 battlerId; u8 battlerId;
u8 spriteId; u8 spriteId;
@@ -524,7 +524,7 @@ static void SlideMonToOffset(struct Sprite * sprite)
sprite->callback = TranslateMonSpriteLinearFixedPoint; sprite->callback = TranslateMonSpriteLinearFixedPoint;
} }
static void sub_8099394(struct Sprite * sprite) static void sub_8099394(struct Sprite *sprite)
{ {
u8 battlerId; u8 battlerId;
u8 spriteId; u8 spriteId;
@@ -557,7 +557,7 @@ static void sub_8099394(struct Sprite * sprite)
sprite->callback = TranslateMonSpriteLinearFixedPoint; sprite->callback = TranslateMonSpriteLinearFixedPoint;
} }
static void sub_809946C(struct Sprite * sprite) static void sub_809946C(struct Sprite *sprite)
{ {
gSprites[sprite->data[5]].x2 = 0; gSprites[sprite->data[5]].x2 = 0;
gSprites[sprite->data[5]].y2 = 0; gSprites[sprite->data[5]].y2 = 0;
src/battle_anim_sound_tasks.c
+10 -9
View File
@@ -4,6 +4,7 @@
#include "battle_anim.h" #include "battle_anim.h"
#include "task.h" #include "task.h"
#include "constants/battle_anim.h" #include "constants/battle_anim.h"
#include "constants/sound.h"
static void sub_80DCE78(u8 taskId); static void sub_80DCE78(u8 taskId);
static void sub_80DCEE4(u8 taskId); static void sub_80DCEE4(u8 taskId);
@@ -142,7 +143,7 @@ void SoundTask_PlayCryHighPitch(u8 taskId)
else else
species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES);
if (species != SPECIES_NONE) if (species != SPECIES_NONE)
PlayCry3(species, pan, 3); PlayCry_ByMode(species, pan, CRY_MODE_HIGH_PITCH);
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
@@ -177,10 +178,10 @@ void SoundTask_PlayDoubleCry(u8 taskId)
gTasks[taskId].data[2] = pan; gTasks[taskId].data[2] = pan;
if (species != SPECIES_NONE) if (species != SPECIES_NONE)
{ {
if (gBattleAnimArgs[1] == TAIL_SENTINEL) if (gBattleAnimArgs[1] == DOUBLE_CRY_GROWL)
PlayCry3(species, pan, 9); PlayCry_ByMode(species, pan, CRY_MODE_GROWL_1);
else else // DOUBLE_CRY_ROAR
PlayCry3(species, pan, 7); PlayCry_ByMode(species, pan, CRY_MODE_ROAR_1);
gTasks[taskId].func = sub_80DD270; gTasks[taskId].func = sub_80DD270;
} }
else else
@@ -202,13 +203,13 @@ static void sub_80DD270(u8 taskId)
{ {
if (!IsCryPlaying()) if (!IsCryPlaying())
{ {
PlayCry3(species, pan, 10); PlayCry_ByMode(species, pan, CRY_MODE_GROWL_2);
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
} }
else if (!IsCryPlaying()) else if (!IsCryPlaying())
{ {
PlayCry3(species, pan, 8); PlayCry_ByMode(species, pan, CRY_MODE_ROAR_2);
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
} }
@@ -232,7 +233,7 @@ void sub_80DD334(u8 taskId)
gTasks[taskId].data[2] = pan; gTasks[taskId].data[2] = pan;
if (species != SPECIES_NONE) if (species != SPECIES_NONE)
{ {
PlayCry3(species, pan, 4); PlayCry_ByMode(species, pan, CRY_MODE_ECHO_START);
gTasks[taskId].func = sub_80DD390; gTasks[taskId].func = sub_80DD390;
} }
else else
@@ -253,7 +254,7 @@ static void sub_80DD390(u8 taskId)
u16 species = gTasks[taskId].data[1]; u16 species = gTasks[taskId].data[1];
s8 pan = gTasks[taskId].data[2]; s8 pan = gTasks[taskId].data[2];
PlayCry3(species, pan, 6); PlayCry_ByMode(species, pan, CRY_MODE_ECHO_END);
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
} }
src/battle_anim_special.c
+23 -23
View File
@@ -659,7 +659,7 @@ void AnimTask_SwitchOutBallEffect(u8 taskId)
y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y); y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y);
priority = gSprites[spriteId].oam.priority; priority = gSprites[spriteId].oam.priority;
subpriority = gSprites[spriteId].subpriority; subpriority = gSprites[spriteId].subpriority;
gTasks[taskId].data[10] = LaunchBallStarsTask(x, y + 32, priority, subpriority, ballId); gTasks[taskId].data[10] = AnimateBallOpenParticles(x, y + 32, priority, subpriority, ballId);
selectedPalettes = SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0); selectedPalettes = SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0);
gTasks[taskId].data[11] = LaunchBallFadeMonTask(0, gBattleAnimAttacker, selectedPalettes, ballId); gTasks[taskId].data[11] = LaunchBallFadeMonTask(0, gBattleAnimAttacker, selectedPalettes, ballId);
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
@@ -748,7 +748,7 @@ void AnimTask_ThrowBall(u8 taskId)
gSprites[spriteId].data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X); gSprites[spriteId].data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X);
gSprites[spriteId].data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) - 16; gSprites[spriteId].data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) - 16;
gSprites[spriteId].callback = SpriteCB_ThrowBall_Init; gSprites[spriteId].callback = SpriteCB_ThrowBall_Init;
gBattleSpritesDataPtr->animationData->field_9_x2 = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible; gBattleSpritesDataPtr->animationData->wildMonInvisible = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible;
gTasks[taskId].data[0] = spriteId; gTasks[taskId].data[0] = spriteId;
gTasks[taskId].func = AnimTask_ThrowBall_WaitAnimObjComplete; gTasks[taskId].func = AnimTask_ThrowBall_WaitAnimObjComplete;
} }
@@ -860,7 +860,7 @@ static void SpriteCB_ThrowBall_ArcFlight(struct Sprite *sprite)
switch (ballId) switch (ballId)
{ {
case 0 ... POKEBALL_COUNT - 1: case 0 ... POKEBALL_COUNT - 1:
LaunchBallStarsTask(sprite->x, sprite->y - 5, 1, 28, ballId); AnimateBallOpenParticles(sprite->x, sprite->y - 5, 1, 28, ballId);
LaunchBallFadeMonTask(0, gBattleAnimTarget, 14, ballId); LaunchBallFadeMonTask(0, gBattleAnimTarget, 14, ballId);
break; break;
} }
@@ -1015,7 +1015,7 @@ static void SpriteCB_ThrowBall_InitShake(struct Sprite *sprite)
sprite->data[3] = 0; sprite->data[3] = 0;
sprite->affineAnimPaused = TRUE; sprite->affineAnimPaused = TRUE;
StartSpriteAffineAnim(sprite, 1); StartSpriteAffineAnim(sprite, 1);
gBattleSpritesDataPtr->animationData->field_C = 0; gBattleSpritesDataPtr->animationData->ballSubpx = 0;
sprite->callback = SpriteCB_ThrowBall_DoShake; sprite->callback = SpriteCB_ThrowBall_DoShake;
PlaySE(SE_BALL); PlaySE(SE_BALL);
} }
@@ -1029,14 +1029,14 @@ static void SpriteCB_ThrowBall_DoShake(struct Sprite *sprite)
switch (sprite->data[3] & 0xFF) switch (sprite->data[3] & 0xFF)
{ {
case 0: case 0:
if (gBattleSpritesDataPtr->animationData->field_C > 0xFF) if (gBattleSpritesDataPtr->animationData->ballSubpx > 0xFF)
{ {
sprite->x2 += sprite->data[4]; sprite->x2 += sprite->data[4];
gBattleSpritesDataPtr->animationData->field_C &= 0xFF; gBattleSpritesDataPtr->animationData->ballSubpx &= 0xFF;
} }
else else
{ {
gBattleSpritesDataPtr->animationData->field_C += 0xB0; gBattleSpritesDataPtr->animationData->ballSubpx += 0xB0;
} }
sprite->data[5]++; sprite->data[5]++;
@@ -1044,7 +1044,7 @@ static void SpriteCB_ThrowBall_DoShake(struct Sprite *sprite)
var0 = sprite->data[5] + 7; var0 = sprite->data[5] + 7;
if (var0 > 14) if (var0 > 14)
{ {
gBattleSpritesDataPtr->animationData->field_C = 0; gBattleSpritesDataPtr->animationData->ballSubpx = 0;
sprite->data[3]++; sprite->data[3]++;
sprite->data[5] = 0; sprite->data[5] = 0;
} }
@@ -1067,14 +1067,14 @@ static void SpriteCB_ThrowBall_DoShake(struct Sprite *sprite)
} }
break; break;
case 2: case 2:
if (gBattleSpritesDataPtr->animationData->field_C > 0xFF) if (gBattleSpritesDataPtr->animationData->ballSubpx > 0xFF)
{ {
sprite->x2 += sprite->data[4]; sprite->x2 += sprite->data[4];
gBattleSpritesDataPtr->animationData->field_C &= 0xFF; gBattleSpritesDataPtr->animationData->ballSubpx &= 0xFF;
} }
else else
{ {
gBattleSpritesDataPtr->animationData->field_C += 0xB0; gBattleSpritesDataPtr->animationData->ballSubpx += 0xB0;
} }
sprite->data[5]++; sprite->data[5]++;
@@ -1082,7 +1082,7 @@ static void SpriteCB_ThrowBall_DoShake(struct Sprite *sprite)
var0 = sprite->data[5] + 12; var0 = sprite->data[5] + 12;
if (var0 > 24) if (var0 > 24)
{ {
gBattleSpritesDataPtr->animationData->field_C = 0; gBattleSpritesDataPtr->animationData->ballSubpx = 0;
sprite->data[3]++; sprite->data[3]++;
sprite->data[5] = 0; sprite->data[5] = 0;
} }
@@ -1104,14 +1104,14 @@ static void SpriteCB_ThrowBall_DoShake(struct Sprite *sprite)
ChangeSpriteAffineAnim(sprite, 1); ChangeSpriteAffineAnim(sprite, 1);
// fall through // fall through
case 4: case 4:
if (gBattleSpritesDataPtr->animationData->field_C > 0xFF) if (gBattleSpritesDataPtr->animationData->ballSubpx > 0xFF)
{ {
sprite->x2 += sprite->data[4]; sprite->x2 += sprite->data[4];
gBattleSpritesDataPtr->animationData->field_C &= 0xFF; gBattleSpritesDataPtr->animationData->ballSubpx &= 0xFF;
} }
else else
{ {
gBattleSpritesDataPtr->animationData->field_C += 0xB0; gBattleSpritesDataPtr->animationData->ballSubpx += 0xB0;
} }
sprite->data[5]++; sprite->data[5]++;
@@ -1119,7 +1119,7 @@ static void SpriteCB_ThrowBall_DoShake(struct Sprite *sprite)
var0 = sprite->data[5] + 4; var0 = sprite->data[5] + 4;
if (var0 > 8) if (var0 > 8)
{ {
gBattleSpritesDataPtr->animationData->field_C = 0; gBattleSpritesDataPtr->animationData->ballSubpx = 0;
sprite->data[3]++; sprite->data[3]++;
sprite->data[5] = 0; sprite->data[5] = 0;
sprite->data[4] = -sprite->data[4]; sprite->data[4] = -sprite->data[4];
@@ -1319,7 +1319,7 @@ static void SpriteCB_ThrowBall_BeginBreakOut(struct Sprite *sprite)
switch (ballId) switch (ballId)
{ {
case 0 ... POKEBALL_COUNT - 1: case 0 ... POKEBALL_COUNT - 1:
LaunchBallStarsTask(sprite->x, sprite->y - 5, 1, 28, ballId); AnimateBallOpenParticles(sprite->x, sprite->y - 5, 1, 28, ballId);
LaunchBallFadeMonTask(1, gBattleAnimTarget, 14, ballId); LaunchBallFadeMonTask(1, gBattleAnimTarget, 14, ballId);
break; break;
} }
@@ -1351,7 +1351,7 @@ static void SpriteCB_ThrowBall_RunBreakOut(struct Sprite *sprite)
if (sprite->animEnded && next) if (sprite->animEnded && next)
{ {
gSprites[gBattlerSpriteIds[gBattleAnimTarget]].y2 = 0; gSprites[gBattlerSpriteIds[gBattleAnimTarget]].y2 = 0;
gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = gBattleSpritesDataPtr->animationData->field_9_x2; gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = gBattleSpritesDataPtr->animationData->wildMonInvisible;
sprite->data[0] = 0; sprite->data[0] = 0;
sprite->callback = BattleAnimObj_SignalEnd; sprite->callback = BattleAnimObj_SignalEnd;
gDoingBattleAnim = FALSE; gDoingBattleAnim = FALSE;
@@ -1430,7 +1430,7 @@ static void LoadBallParticleGfx(u8 ballId)
} }
} }
u8 LaunchBallStarsTask(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId) u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId)
{ {
u8 taskId; u8 taskId;
@@ -1448,7 +1448,7 @@ u8 LaunchBallStarsTask(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId)
static void IncrementBattleParticleCounter(void) static void IncrementBattleParticleCounter(void)
{ {
if (gMain.inBattle) if (gMain.inBattle)
gBattleSpritesDataPtr->animationData->field_A++; gBattleSpritesDataPtr->animationData->numBallParticles++;
} }
static void PokeBallOpenParticleAnimation(u8 taskId) static void PokeBallOpenParticleAnimation(u8 taskId)
@@ -1850,8 +1850,8 @@ static void DestroyBallOpenAnimationParticle(struct Sprite *sprite)
} }
else else
{ {
gBattleSpritesDataPtr->animationData->field_A--; gBattleSpritesDataPtr->animationData->numBallParticles--;
if (gBattleSpritesDataPtr->animationData->field_A == 0) if (gBattleSpritesDataPtr->animationData->numBallParticles == 0)
{ {
for (j = 0; j < POKEBALL_COUNT; j++) for (j = 0; j < POKEBALL_COUNT; j++)
{ {
@@ -2097,7 +2097,7 @@ static void AnimTask_ShinySparkles(u8 taskId)
return; return;
} }
if (gBattleSpritesDataPtr->animationData->field_A) if (gBattleSpritesDataPtr->animationData->numBallParticles)
return; return;
counter = gTasks[taskId].data[10]++; counter = gTasks[taskId].data[10]++;
src/battle_anim_status_effects.c
+1 -1
View File
@@ -355,7 +355,7 @@ void AnimTask_FrozenIceCube(u8 taskId)
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL);
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16)); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16));
spriteId = CreateSprite(&sUnknown_83BF55C, x, y, 4); spriteId = CreateSprite(&sUnknown_83BF55C, x, y, 4);
if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == SPRITE_INVALID_TAG) if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == TAG_NONE)
gSprites[spriteId].invisible = TRUE; gSprites[spriteId].invisible = TRUE;
SetSubspriteTables(&gSprites[spriteId], sUnknown_83BF554); SetSubspriteTables(&gSprites[spriteId], sUnknown_83BF554);
src/battle_controller_link_opponent.c
+6 -5
View File
@@ -13,6 +13,7 @@
#include "battle_message.h" #include "battle_message.h"
#include "constants/battle_anim.h" #include "constants/battle_anim.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/sound.h"
#include "constants/trainers.h" #include "constants/trainers.h"
static void LinkOpponentHandleGetMonData(void); static void LinkOpponentHandleGetMonData(void);
@@ -231,7 +232,7 @@ static void Intro_WaitForShinyAnimAndHealthbox(void)
} }
else else
{ {
m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256); m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 256);
} }
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].introEndDelay = 3; gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].introEndDelay = 3;
gBattlerControllerFuncs[gActiveBattler] = Intro_DelayAndEnd; gBattlerControllerFuncs[gActiveBattler] = Intro_DelayAndEnd;
@@ -270,7 +271,7 @@ static void Intro_TryShinyAnimShowHealthbox(void)
StartHealthboxSlideIn(gActiveBattler); StartHealthboxSlideIn(gActiveBattler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
SetBattlerShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES)); SetBattlerShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES));
gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 0; gBattleSpritesDataPtr->animationData->introAnimActive = FALSE;
gBattlerControllerFuncs[gActiveBattler] = Intro_WaitForShinyAnimAndHealthbox; gBattlerControllerFuncs[gActiveBattler] = Intro_WaitForShinyAnimAndHealthbox;
} }
} }
@@ -366,7 +367,7 @@ static void SwitchIn_HandleSoundAndEnd(void)
{ {
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive && !IsCryPlayingOrClearCrySongs()) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive && !IsCryPlayingOrClearCrySongs())
{ {
m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x100);
LinkOpponentBufferExecCompleted(); LinkOpponentBufferExecCompleted();
} }
} }
@@ -1512,7 +1513,7 @@ static void LinkOpponentHandleFaintingCry(void)
{ {
u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
PlayCry3(species, 25, 5); PlayCry_ByMode(species, 25, CRY_MODE_FAINT);
LinkOpponentBufferExecCompleted(); LinkOpponentBufferExecCompleted();
} }
@@ -1537,7 +1538,7 @@ static void LinkOpponentHandleIntroTrainerBallThrow(void)
gTasks[taskId].data[0] = gActiveBattler; gTasks[taskId].data[0] = gActiveBattler;
if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown)
gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary;
gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 1; gBattleSpritesDataPtr->animationData->introAnimActive = TRUE;
gBattlerControllerFuncs[gActiveBattler] = LinkOpponentDummy; gBattlerControllerFuncs[gActiveBattler] = LinkOpponentDummy;
} }
src/battle_controller_link_partner.c
+4 -3
View File
@@ -12,6 +12,7 @@
#include "battle_message.h" #include "battle_message.h"
#include "constants/battle_anim.h" #include "constants/battle_anim.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/sound.h"
static void LinkPartnerHandleGetMonData(void); static void LinkPartnerHandleGetMonData(void);
static void LinkPartnerHandleGetRawMonData(void); static void LinkPartnerHandleGetRawMonData(void);
@@ -235,7 +236,7 @@ static void Intro_ShowHealthbox(void)
HEALTHBOX_ALL); HEALTHBOX_ALL);
StartHealthboxSlideIn(gActiveBattler); StartHealthboxSlideIn(gActiveBattler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 0; gBattleSpritesDataPtr->animationData->introAnimActive = FALSE;
gBattlerControllerFuncs[gActiveBattler] = Intro_WaitForHealthbox; gBattlerControllerFuncs[gActiveBattler] = Intro_WaitForHealthbox;
} }
} }
@@ -1425,7 +1426,7 @@ static void LinkPartnerHandleFaintingCry(void)
{ {
u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
PlayCry3(species, -25, 5); PlayCry_ByMode(species, -25, CRY_MODE_FAINT);
LinkPartnerBufferExecCompleted(); LinkPartnerBufferExecCompleted();
} }
@@ -1463,7 +1464,7 @@ static void LinkPartnerHandleIntroTrainerBallThrow(void)
gTasks[taskId].data[0] = gActiveBattler; gTasks[taskId].data[0] = gActiveBattler;
if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown)
gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary;
gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 1; gBattleSpritesDataPtr->animationData->introAnimActive = TRUE;
gBattlerControllerFuncs[gActiveBattler] = LinkPartnerDummy; gBattlerControllerFuncs[gActiveBattler] = LinkPartnerDummy;
} }
src/battle_controller_oak_old_man.c
+2 -2
View File
@@ -427,7 +427,7 @@ static void Intro_TryShinyAnimShowHealthbox(void)
HEALTHBOX_ALL); HEALTHBOX_ALL);
StartHealthboxSlideIn(gActiveBattler); StartHealthboxSlideIn(gActiveBattler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 0; gBattleSpritesDataPtr->animationData->introAnimActive = FALSE;
gBattlerControllerFuncs[gActiveBattler] = Intro_WaitForShinyAnimAndHealthbox; gBattlerControllerFuncs[gActiveBattler] = Intro_WaitForShinyAnimAndHealthbox;
} }
} }
@@ -2093,7 +2093,7 @@ static void OakOldManHandleIntroTrainerBallThrow(void)
gTasks[taskId].data[0] = gActiveBattler; gTasks[taskId].data[0] = gActiveBattler;
if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown)
gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary;
gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 1; gBattleSpritesDataPtr->animationData->introAnimActive = TRUE;
gBattlerControllerFuncs[gActiveBattler] = PlayerDummy; gBattlerControllerFuncs[gActiveBattler] = PlayerDummy;
} }
else else
src/battle_controller_opponent.c
+6 -5
View File
@@ -19,6 +19,7 @@
#include "constants/battle_anim.h" #include "constants/battle_anim.h"
#include "constants/moves.h" #include "constants/moves.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/sound.h"
static void OpponentHandleGetMonData(void); static void OpponentHandleGetMonData(void);
static void OpponentHandleGetRawMonData(void); static void OpponentHandleGetRawMonData(void);
@@ -233,7 +234,7 @@ static void Intro_WaitForShinyAnimAndHealthbox(void)
if (gBattleTypeFlags & BATTLE_TYPE_MULTI) if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
m4aMPlayContinue(&gMPlayInfo_BGM); m4aMPlayContinue(&gMPlayInfo_BGM);
else else
m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256); m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 256);
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].introEndDelay = 3; gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].introEndDelay = 3;
gBattlerControllerFuncs[gActiveBattler] = Intro_DelayAndEnd; gBattlerControllerFuncs[gActiveBattler] = Intro_DelayAndEnd;
} }
@@ -264,7 +265,7 @@ static void Intro_TryShinyAnimShowHealthbox(void)
StartHealthboxSlideIn(gActiveBattler); StartHealthboxSlideIn(gActiveBattler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
SetBattlerShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES)); SetBattlerShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES));
gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = FALSE; gBattleSpritesDataPtr->animationData->introAnimActive = FALSE;
gBattlerControllerFuncs[gActiveBattler] = Intro_WaitForShinyAnimAndHealthbox; gBattlerControllerFuncs[gActiveBattler] = Intro_WaitForShinyAnimAndHealthbox;
} }
} }
@@ -372,7 +373,7 @@ static void SwitchIn_HandleSoundAndEnd(void)
{ {
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive && !IsCryPlayingOrClearCrySongs()) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive && !IsCryPlayingOrClearCrySongs())
{ {
m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x100);
OpponentBufferExecCompleted(); OpponentBufferExecCompleted();
} }
} }
@@ -1611,7 +1612,7 @@ static void OpponentHandleFaintingCry(void)
{ {
u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
PlayCry3(species, 25, 5); PlayCry_ByMode(species, 25, CRY_MODE_FAINT);
OpponentBufferExecCompleted(); OpponentBufferExecCompleted();
} }
@@ -1637,7 +1638,7 @@ static void OpponentHandleIntroTrainerBallThrow(void)
gTasks[taskId].data[0] = gActiveBattler; gTasks[taskId].data[0] = gActiveBattler;
if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown)
gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary;
gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = TRUE; gBattleSpritesDataPtr->animationData->introAnimActive = TRUE;
gBattlerControllerFuncs[gActiveBattler] = OpponentDummy; gBattlerControllerFuncs[gActiveBattler] = OpponentDummy;
} }
src/battle_controller_player.c
+7 -6
View File
@@ -22,6 +22,7 @@
#include "constants/items.h" #include "constants/items.h"
#include "constants/moves.h" #include "constants/moves.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/sound.h"
static void PlayerHandleGetMonData(void); static void PlayerHandleGetMonData(void);
static void PlayerHandleSetMonData(void); static void PlayerHandleSetMonData(void);
@@ -898,7 +899,7 @@ static void Intro_WaitForShinyAnimAndHealthbox(void)
if (gBattleTypeFlags & BATTLE_TYPE_MULTI) if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
m4aMPlayContinue(&gMPlayInfo_BGM); m4aMPlayContinue(&gMPlayInfo_BGM);
else else
m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256); m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 256);
HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
if (IsDoubleBattle()) if (IsDoubleBattle())
HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]], gActiveBattler ^ BIT_FLANK); HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]], gActiveBattler ^ BIT_FLANK);
@@ -930,7 +931,7 @@ static void Intro_TryShinyAnimShowHealthbox(void)
HEALTHBOX_ALL); HEALTHBOX_ALL);
StartHealthboxSlideIn(gActiveBattler); StartHealthboxSlideIn(gActiveBattler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 0; gBattleSpritesDataPtr->animationData->introAnimActive = FALSE;
gBattlerControllerFuncs[gActiveBattler] = Intro_WaitForShinyAnimAndHealthbox; gBattlerControllerFuncs[gActiveBattler] = Intro_WaitForShinyAnimAndHealthbox;
} }
} }
@@ -955,7 +956,7 @@ static void SwitchIn_HandleSoundAndEnd(void)
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive
&& !IsCryPlayingOrClearCrySongs()) && !IsCryPlayingOrClearCrySongs())
{ {
m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x100);
HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
PlayerBufferExecCompleted(); PlayerBufferExecCompleted();
} }
@@ -984,7 +985,7 @@ void Task_PlayerController_RestoreBgmAfterCry(u8 taskId)
{ {
if (!IsCryPlayingOrClearCrySongs()) if (!IsCryPlayingOrClearCrySongs())
{ {
m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x100);
DestroyTask(taskId); DestroyTask(taskId);
} }
} }
@@ -2687,7 +2688,7 @@ static void PlayerHandlePlayFanfare(void)
static void PlayerHandleFaintingCry(void) static void PlayerHandleFaintingCry(void)
{ {
PlayCry3(GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES), -25, 5); PlayCry_ByMode(GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES), -25, CRY_MODE_FAINT);
PlayerBufferExecCompleted(); PlayerBufferExecCompleted();
} }
@@ -2718,7 +2719,7 @@ static void PlayerHandleIntroTrainerBallThrow(void)
gTasks[taskId].data[0] = gActiveBattler; gTasks[taskId].data[0] = gActiveBattler;
if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown)
gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary;
gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 1; gBattleSpritesDataPtr->animationData->introAnimActive = TRUE;
gBattlerControllerFuncs[gActiveBattler] = PlayerDummy; gBattlerControllerFuncs[gActiveBattler] = PlayerDummy;
} }
src/battle_controller_pokedude.c
+2 -2
View File
@@ -408,7 +408,7 @@ static void Intro_TryShinyAnimShowHealthbox(void)
HEALTHBOX_ALL); HEALTHBOX_ALL);
StartHealthboxSlideIn(gActiveBattler); StartHealthboxSlideIn(gActiveBattler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 0; gBattleSpritesDataPtr->animationData->introAnimActive = FALSE;
gBattlerControllerFuncs[gActiveBattler] = Intro_WaitForShinyAnimAndHealthbox; gBattlerControllerFuncs[gActiveBattler] = Intro_WaitForShinyAnimAndHealthbox;
} }
} }
@@ -1865,7 +1865,7 @@ static void PokedudeHandleIntroTrainerBallThrow(void)
gTasks[taskId].data[0] = gActiveBattler; gTasks[taskId].data[0] = gActiveBattler;
if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown)
gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary;
gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 1; gBattleSpritesDataPtr->animationData->introAnimActive = TRUE;
gBattlerControllerFuncs[gActiveBattler] = PokedudeDummy; gBattlerControllerFuncs[gActiveBattler] = PokedudeDummy;
} }
src/battle_gfx_sfx_util.c
+4 -1
View File
@@ -1042,17 +1042,20 @@ void FreeMonSpritesGfx(void)
FREE_AND_SET_NULL(gMonSpritesGfxPtr); FREE_AND_SET_NULL(gMonSpritesGfxPtr);
} }
bool32 ShouldPlayNormalPokeCry(struct Pokemon *mon) bool32 ShouldPlayNormalMonCry(struct Pokemon *mon)
{ {
s16 hp, maxHP; s16 hp, maxHP;
s32 barLevel; s32 barLevel;
if (GetMonData(mon, MON_DATA_STATUS) & (STATUS1_ANY | STATUS1_TOXIC_COUNTER)) if (GetMonData(mon, MON_DATA_STATUS) & (STATUS1_ANY | STATUS1_TOXIC_COUNTER))
return FALSE; return FALSE;
hp = GetMonData(mon, MON_DATA_HP); hp = GetMonData(mon, MON_DATA_HP);
maxHP = GetMonData(mon, MON_DATA_MAX_HP); maxHP = GetMonData(mon, MON_DATA_MAX_HP);
barLevel = GetHPBarLevel(hp, maxHP); barLevel = GetHPBarLevel(hp, maxHP);
if (barLevel <= HP_BAR_YELLOW) if (barLevel <= HP_BAR_YELLOW)
return FALSE; return FALSE;
return TRUE; return TRUE;
} }

Some files were not shown because too many files have changed in this diff Show More