Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-10-13 20:58:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge w pret

Browse Source
This commit is contained in:
ghoulslash
2021-11-05 09:22:24 -04:00
parent 222d1d3194 7940f121f6
commit eee3f5b181
304 changed files with 7956 additions and 7231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/battle_ai_scripts.s
View File

@@ -735,7 +735,7 @@ AI_CheckViability:
if_effect EFFECT_PSYCH_UP, AI_CV_PsychUp
if_effect EFFECT_MIRROR_COAT, AI_CV_MirrorCoat
if_effect EFFECT_SKULL_BASH, AI_CV_ChargeUpMove
if_effect EFFECT_SOLARBEAM, AI_CV_ChargeUpMove
if_effect EFFECT_SOLAR_BEAM, AI_CV_ChargeUpMove
if_effect EFFECT_SEMI_INVULNERABLE, AI_CV_SemiInvulnerable
if_effect EFFECT_SOFTBOILED, AI_CV_Heal
if_effect EFFECT_FAKE_OUT, AI_CV_FakeOut
@@ -3051,7 +3051,7 @@ AI_HPAware_DiscouragedEffectsWhenLowHP:
.byte EFFECT_BELLY_DRUM
.byte EFFECT_PSYCH_UP
.byte EFFECT_MIRROR_COAT
.byte EFFECT_SOLARBEAM
.byte EFFECT_SOLAR_BEAM
.byte EFFECT_ERUPTION
.byte EFFECT_TICKLE
.byte EFFECT_COSMIC_POWER

64
data/battle_anim_scripts.s
View File

@@ -5474,45 +5474,45 @@ SolarBeamAbsorbEffect:
delay 2
return
SolarBeamUnleash:
call SetSolarbeamBg
call SetSolarBeamBg
panse SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
createvisualtask AnimTask_CreateSmallSolarbeamOrbs, 5
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0
createvisualtask AnimTask_CreateSmallSolarBeamOrbs, 5
createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0
delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1
createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1
delay 4
createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 1, 0, 10, RGB(25, 31, 0)
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2
createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2
delay 4
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 65, 1
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3
createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3
delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4
createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4
delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5
createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5
delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6
createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6
delay 4
call SolarBeamUnleash1
call SolarBeamUnleash1
waitforvisualfinish
createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 1, 10, 0, RGB(25, 31, 0)
call UnsetSolarbeamBg
call UnsetSolarBeamBg
goto SolarBeamEnd
SolarBeamUnleash1:
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0
createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0
delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1
createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1
delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2
createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2
delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3
createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3
delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4
createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4
delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5
createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5
delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6
createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6
delay 4
return
@@ -10189,26 +10189,26 @@ UnsetSkyBg:
waitbgfadein
return
SetSolarbeamBg:
SetSolarBeamBg:
createvisualtask AnimTask_IsContest, 2
jumprettrue SetSolarbeamBgContest
jumprettrue SetSolarBeamBgContest
createvisualtask AnimTask_IsTargetPlayerSide, 2
jumpretfalse SetSolarbeamBgOpponent
goto SetSolarbeamBgPlayer
SetSolarbeamBgContinue:
jumpretfalse SetSolarBeamBgOpponent
goto SetSolarBeamBgPlayer
SetSolarBeamBgContinue:
waitbgfadein
return
SetSolarbeamBgContest:
fadetobg BG_SOLARBEAM_CONTESTS
goto SetSolarbeamBgContinue
SetSolarbeamBgPlayer:
fadetobg BG_SOLARBEAM_PLAYER
goto SetSolarbeamBgContinue
SetSolarbeamBgOpponent:
fadetobg BG_SOLARBEAM_OPPONENT
goto SetSolarbeamBgContinue
SetSolarBeamBgContest:
fadetobg BG_SOLAR_BEAM_CONTESTS
goto SetSolarBeamBgContinue
SetSolarBeamBgPlayer:
fadetobg BG_SOLAR_BEAM_PLAYER
goto SetSolarBeamBgContinue
SetSolarBeamBgOpponent:
fadetobg BG_SOLAR_BEAM_OPPONENT
goto SetSolarBeamBgContinue
UnsetSolarbeamBg:
UnsetSolarBeamBg:
restorebg
waitbgfadein
return

14
data/battle_scripts_1.s
View File

@@ -168,7 +168,7 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectFutureSight @ EFFECT_FUTURE_SIGHT
.4byte BattleScript_EffectGust @ EFFECT_GUST
.4byte BattleScript_EffectStomp @ EFFECT_FLINCH_MINIMIZE_HIT
.4byte BattleScript_EffectSolarbeam @ EFFECT_SOLARBEAM
.4byte BattleScript_EffectSolarBeam @ EFFECT_SOLAR_BEAM
.4byte BattleScript_EffectThunder @ EFFECT_THUNDER
.4byte BattleScript_EffectTeleport @ EFFECT_TELEPORT
.4byte BattleScript_EffectBeatUp @ EFFECT_BEAT_UP
@@ -1898,17 +1898,17 @@ BattleScript_EffectStomp::
setbyte sDMG_MULTIPLIER, 2
goto BattleScript_FlinchEffect
BattleScript_EffectSolarbeam::
jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_SolarbeamDecideTurn
jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_SolarbeamDecideTurn
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN, BattleScript_SolarbeamOnFirstTurn
BattleScript_SolarbeamDecideTurn::
BattleScript_EffectSolarBeam::
jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_SolarBeamDecideTurn
jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_SolarBeamDecideTurn
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN, BattleScript_SolarBeamOnFirstTurn
BattleScript_SolarBeamDecideTurn::
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
setbyte sTWOTURN_STRINGID, B_MSG_TURN1_SOLAR_BEAM
call BattleScriptFirstChargingTurn
goto BattleScript_MoveEnd
BattleScript_SolarbeamOnFirstTurn::
BattleScript_SolarBeamOnFirstTurn::
orword gHitMarker, HITMARKER_CHARGING
setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER
seteffectprimary

0
data/unknown_serial_data.bin → data/ereader_link_data.bin
View File

6
data/ereader_link_data.s Normal file
View File

@@ -0,0 +1,6 @@
.section .rodata
.align 2
gEReaderLinkData_Start::
.incbin "data/ereader_link_data.bin"
gEReaderLinkData_End::

2
data/event_scripts.s
View File

@@ -1026,7 +1026,7 @@ Common_EventScript_LegendaryFlewAway::
.include "data/scripts/mauville_man.inc"
.include "data/scripts/field_move_scripts.inc"
.include "data/scripts/item_ball_scripts.inc"
.include "data/scripts/mystery_event_club.inc"
.include "data/scripts/profile_man.inc"
.include "data/scripts/day_care.inc"
.include "data/scripts/flash.inc"
.include "data/scripts/players_house.inc"

6
data/field_effect_scripts.s
View File

@@ -50,7 +50,7 @@ gFieldEffectScriptPointers::
.4byte gFieldEffectScript_HotSpringsWater @ FLDEFF_HOT_SPRINGS_WATER
.4byte gFieldEffectScript_UseWaterfall @ FLDEFF_USE_WATERFALL
.4byte gFieldEffectScript_UseDive @ FLDEFF_USE_DIVE
.4byte gFieldEffectScript_Pokeball @ FLDEFF_POKEBALL
.4byte gFieldEffectScript_PokeballTrail @ FLDEFF_POKEBALL_TRAIL
.4byte gFieldEffectScript_HeartIcon @ FLDEFF_HEART_ICON
.4byte gFieldEffectScript_Nop47 @ FLDEFF_NOP_47
.4byte gFieldEffectScript_Nop48 @ FLDEFF_NOP_48
@@ -255,9 +255,9 @@ gFieldEffectScript_UseDive::
field_eff_callnative FldEff_UseDive
field_eff_end
gFieldEffectScript_Pokeball::
gFieldEffectScript_PokeballTrail::
field_eff_loadpal gSpritePalette_Pokeball
field_eff_callnative FldEff_Pokeball
field_eff_callnative FldEff_PokeballTrail
field_eff_end
gFieldEffectScript_HeartIcon::

76
data/fonts.s
View File

@@ -1,76 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gFont8LatinGlyphs::
.incbin "graphics/fonts/font8.latfont"
.align 2
gFont8LatinGlyphWidths::
.include "graphics/fonts/font8_latin_widths.inc"
.align 2
gFont0LatinGlyphs::
.incbin "graphics/fonts/font0.latfont"
.align 2
gFont0LatinGlyphWidths::
.include "graphics/fonts/font0_latin_widths.inc"
.align 2
gFont7LatinGlyphs::
.incbin "graphics/fonts/font7.latfont"
.align 2
gFont7LatinGlyphWidths::
.include "graphics/fonts/font7_latin_widths.inc"
.align 2
gFont2LatinGlyphs::
.incbin "graphics/fonts/font2.latfont"
.align 2
gFont2LatinGlyphWidths::
.include "graphics/fonts/font2_latin_widths.inc"
.align 2
gFont1LatinGlyphs::
.incbin "graphics/fonts/font1.latfont"
.align 2
gFont1LatinGlyphWidths::
.include "graphics/fonts/font1_latin_widths.inc"
.align 2
gFont0JapaneseGlyphs::
.incbin "graphics/fonts/font0.hwjpnfont"
.align 2
gFont1JapaneseGlyphs::
.incbin "graphics/fonts/font1.hwjpnfont"
.align 2
gUnusedJapaneseFireRedLeafGreenMaleFontGlyphs::
.incbin "graphics/fonts/unused_frlg_male.fwjpnfont"
.align 2
gUnusedJapaneseFireRedLeafGreenMaleFontGlyphWidths::
.include "graphics/fonts/unused_japanese_frlg_male_font_widths.inc"
.align 2
gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphs::
.incbin "graphics/fonts/unused_frlg_female.fwjpnfont"
.align 2
gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphWidths::
.include "graphics/fonts/unused_japanese_frlg_female_font_widths.inc"
.align 2
gFont2JapaneseGlyphs::
.incbin "graphics/fonts/font2.fwjpnfont"
.align 2
gFont2JapaneseGlyphWidths::
.include "graphics/fonts/font2_japanese_widths.inc"

8
data/maps/AncientTomb/scripts.inc
View File

@@ -40,9 +40,7 @@ AncientTomb_EventScript_HideRegiEntrance::
AncientTomb_EventScript_CaveEntranceMiddle::
lockall
goto_if_set FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_BigHoleInWall
braillemessage AncientTomb_Braille_ShineInTheMiddle
waitbuttonpress
closebraillemessage
braillemsgbox AncientTomb_Braille_ShineInTheMiddle
releaseall
end
@@ -53,9 +51,7 @@ AncientTomb_EventScript_BigHoleInWall::
AncientTomb_EventScript_CaveEntranceSide::
lockall
braillemessage AncientTomb_Braille_ShineInTheMiddle
waitbuttonpress
closebraillemessage
braillemsgbox AncientTomb_Braille_ShineInTheMiddle
releaseall
end

20
data/maps/BattleFrontier_RankingHall/scripts.inc
View File

@@ -3,61 +3,61 @@ BattleFrontier_RankingHall_MapScripts::
BattleFrontier_RankingHall_EventScript_TowerSinglesRecords::
lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_SINGLES
setvar VAR_0x8005, RANKING_HALL_TOWER_SINGLES
goto BattleFrontier_RankingHall_EventScript_ShowRecords
end
BattleFrontier_RankingHall_EventScript_TowerDoublesRecords::
lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_DOUBLES
setvar VAR_0x8005, RANKING_HALL_TOWER_DOUBLES
goto BattleFrontier_RankingHall_EventScript_ShowRecords
end
BattleFrontier_RankingHall_EventScript_TowerMultisRecords::
lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_MULTIS
setvar VAR_0x8005, RANKING_HALL_TOWER_MULTIS
goto BattleFrontier_RankingHall_EventScript_ShowRecords
end
BattleFrontier_RankingHall_EventScript_TowerLinkRecords::
lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_LINK
setvar VAR_0x8005, RANKING_HALL_TOWER_LINK
goto BattleFrontier_RankingHall_EventScript_ShowRecords
end
BattleFrontier_RankingHall_EventScript_ArenaRecords::
lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_ARENA
setvar VAR_0x8005, RANKING_HALL_ARENA
goto BattleFrontier_RankingHall_EventScript_ShowRecords
end
BattleFrontier_RankingHall_EventScript_PalaceRecords::
lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_PALACE
setvar VAR_0x8005, RANKING_HALL_PALACE
goto BattleFrontier_RankingHall_EventScript_ShowRecords
end
BattleFrontier_RankingHall_EventScript_FactoryRecords::
lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_FACTORY
setvar VAR_0x8005, RANKING_HALL_FACTORY
goto BattleFrontier_RankingHall_EventScript_ShowRecords
end
BattleFrontier_RankingHall_EventScript_DomeRecords::
lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_DOME
setvar VAR_0x8005, RANKING_HALL_DOME
goto BattleFrontier_RankingHall_EventScript_ShowRecords
end
BattleFrontier_RankingHall_EventScript_PikeRecords::
lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_PIKE
setvar VAR_0x8005, RANKING_HALL_PIKE
goto BattleFrontier_RankingHall_EventScript_ShowRecords
end
BattleFrontier_RankingHall_EventScript_PyramidRecords::
lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_PYRAMID
setvar VAR_0x8005, RANKING_HALL_PYRAMID
goto BattleFrontier_RankingHall_EventScript_ShowRecords
end

8
data/maps/DesertRuins/scripts.inc
View File

@@ -40,9 +40,7 @@ DesertRuins_EventScript_ShowRegirock::
DesertRuins_EventScript_CaveEntranceMiddle::
lockall
goto_if_set FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_BigHoleInWall
braillemessage DesertRuins_Braille_UseRockSmash
waitbuttonpress
closebraillemessage
braillemsgbox DesertRuins_Braille_UseRockSmash
releaseall
end
@@ -53,9 +51,7 @@ DesertRuins_EventScript_BigHoleInWall::
DesertRuins_EventScript_CaveEntranceSide::
lockall
braillemessage DesertRuins_Braille_UseRockSmash
waitbuttonpress
closebraillemessage
braillemsgbox DesertRuins_Braille_UseRockSmash
releaseall
end

2
data/maps/PetalburgCity_PokemonCenter_1F/map.json
View File

@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MysteryEventClub_EventScript_Man",
"script": "ProfileMan_EventScript_Man",
"flag": "0"
},
{

36
data/maps/SealedChamber_InnerRoom/scripts.inc
View File

@@ -3,27 +3,25 @@ SealedChamber_InnerRoom_MapScripts::
SealedChamber_InnerRoom_EventScript_BrailleBackWall::
lockall
braillemessage SealedChamber_InnerRoom_Braille_FirstWailordLastRelicanth
waitbuttonpress
closebraillemessage
braillemsgbox SealedChamber_InnerRoom_Braille_FirstWailordLastRelicanth
goto_if_set FLAG_REGI_DOORS_OPENED, SealedChamber_InnerRoom_EventScript_NoEffect
specialvar VAR_RESULT, CheckRelicanthWailord
compare VAR_RESULT, FALSE
goto_if_eq SealedChamber_InnerRoom_EventScript_NoEffect
fadeoutbgm 0
playse SE_TRUCK_MOVE
special DoSealedChamberShakingEffect1
special DoSealedChamberShakingEffect_Long
waitstate
delay 40
special DoSealedChamberShakingEffect2
special DoSealedChamberShakingEffect_Short
waitstate
playse SE_DOOR
delay 40
special DoSealedChamberShakingEffect2
special DoSealedChamberShakingEffect_Short
waitstate
playse SE_DOOR
delay 40
special DoSealedChamberShakingEffect2
special DoSealedChamberShakingEffect_Short
waitstate
playse SE_DOOR
delay 40
@@ -40,49 +38,37 @@ SealedChamber_InnerRoom_EventScript_NoEffect::
SealedChamber_InnerRoom_EventScript_BrailleStoryPart1::
lockall
braillemessage SealedChamber_InnerRoom_Braille_InThisCaveWeHaveLived
waitbuttonpress
closebraillemessage
braillemsgbox SealedChamber_InnerRoom_Braille_InThisCaveWeHaveLived
releaseall
end
SealedChamber_InnerRoom_EventScript_BrailleStoryPart2::
lockall
braillemessage SealedChamber_InnerRoom_Braille_WeOweAllToThePokemon
waitbuttonpress
closebraillemessage
braillemsgbox SealedChamber_InnerRoom_Braille_WeOweAllToThePokemon
releaseall
end
SealedChamber_InnerRoom_EventScript_BrailleStoryPart3::
lockall
braillemessage SealedChamber_InnerRoom_Braille_ButWeSealedThePokemonAway
waitbuttonpress
closebraillemessage
braillemsgbox SealedChamber_InnerRoom_Braille_ButWeSealedThePokemonAway
releaseall
end
SealedChamber_InnerRoom_EventScript_BrailleStoryPart4::
lockall
braillemessage SealedChamber_InnerRoom_Braille_WeFearedIt
waitbuttonpress
closebraillemessage
braillemsgbox SealedChamber_InnerRoom_Braille_WeFearedIt
releaseall
end
SealedChamber_InnerRoom_EventScript_BrailleStoryPart5::
lockall
braillemessage SealedChamber_InnerRoom_Braille_ThoseWithCourageHope
waitbuttonpress
closebraillemessage
braillemsgbox SealedChamber_InnerRoom_Braille_ThoseWithCourageHope
releaseall
end
SealedChamber_InnerRoom_EventScript_BrailleStoryPart6::
lockall
braillemessage SealedChamber_InnerRoom_Braille_OpenDoorEternalPokemonWaits
waitbuttonpress
closebraillemessage
braillemsgbox SealedChamber_InnerRoom_Braille_OpenDoorEternalPokemonWaits
releaseall
end

48
data/maps/SealedChamber_OuterRoom/scripts.inc
View File

@@ -28,90 +28,68 @@ SealedChamber_OuterRoom_EventScript_CloseInnerRoomEntrance::
SealedChamber_OuterRoom_EventScript_BrailleABC::
lockall
braillemessage SealedChamber_OuterRoom_Braille_ABC
waitbuttonpress
closebraillemessage
braillemsgbox SealedChamber_OuterRoom_Braille_ABC
releaseall
end
SealedChamber_OuterRoom_EventScript_BrailleGHI::
lockall
braillemessage SealedChamber_OuterRoom_Braille_GHI
waitbuttonpress
closebraillemessage
braillemsgbox SealedChamber_OuterRoom_Braille_GHI
releaseall
end
SealedChamber_OuterRoom_EventScript_BrailleMNO::
lockall
braillemessage SealedChamber_OuterRoom_Braille_MNO
waitbuttonpress
closebraillemessage
braillemsgbox SealedChamber_OuterRoom_Braille_MNO
releaseall
end
SealedChamber_OuterRoom_EventScript_BrailleTUV::
lockall
braillemessage SealedChamber_OuterRoom_Braille_TUV
waitbuttonpress
closebraillemessage
braillemsgbox SealedChamber_OuterRoom_Braille_TUV
releaseall
end
SealedChamber_OuterRoom_EventScript_BrailleDEF::
lockall
braillemessage SealedChamber_OuterRoom_Braille_DEF
waitbuttonpress
closebraillemessage
braillemsgbox SealedChamber_OuterRoom_Braille_DEF
releaseall
end
SealedChamber_OuterRoom_EventScript_BrailleJKL::
lockall
braillemessage SealedChamber_OuterRoom_Braille_JKL
waitbuttonpress
closebraillemessage
braillemsgbox SealedChamber_OuterRoom_Braille_JKL
releaseall
end
SealedChamber_OuterRoom_EventScript_BraillePQRS::
lockall
braillemessage SealedChamber_OuterRoom_Braille_PQRS
waitbuttonpress
closebraillemessage
braillemsgbox SealedChamber_OuterRoom_Braille_PQRS
releaseall
end
SealedChamber_OuterRoom_EventScript_BraillePeriod::
lockall
braillemessage SealedChamber_OuterRoom_Braille_Period
waitbuttonpress
closebraillemessage
braillemsgbox SealedChamber_OuterRoom_Braille_Period
releaseall
end
SealedChamber_OuterRoom_EventScript_BrailleWXYZ::
lockall
braillemessage SealedChamber_OuterRoom_Braille_WXYZ
waitbuttonpress
closebraillemessage
braillemsgbox SealedChamber_OuterRoom_Braille_WXYZ
releaseall
end
SealedChamber_OuterRoom_EventScript_BrailleComma::
lockall
braillemessage SealedChamber_OuterRoom_Braille_Comma
waitbuttonpress
closebraillemessage
braillemsgbox SealedChamber_OuterRoom_Braille_Comma
releaseall
end
SealedChamber_OuterRoom_EventScript_InnerRoomEntranceWall::
lockall
goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_HoleInWall
braillemessage SealedChamber_OuterRoom_Braille_DigHere
waitbuttonpress
closebraillemessage
braillemsgbox SealedChamber_OuterRoom_Braille_DigHere
releaseall
end
@@ -122,9 +100,7 @@ SealedChamber_OuterRoom_EventScript_HoleInWall::
SealedChamber_OuterRoom_EventScript_BrailleDigHere::
lockall
braillemessage SealedChamber_OuterRoom_Braille_DigHere
waitbuttonpress
closebraillemessage
braillemsgbox SealedChamber_OuterRoom_Braille_DigHere
releaseall
end

4
data/maps/Underwater_SealedChamber/scripts.inc
View File

@@ -20,9 +20,7 @@ Underwater_SealedChamber_EventScript_SurfaceSealedChamber::
Underwater_SealedChamber_EventScript_Braille::
lockall
braillemessage Underwater_SealedChamber_Braille_GoUpHere
waitbuttonpress
closebraillemessage
braillemsgbox Underwater_SealedChamber_Braille_GoUpHere
releaseall
end

170
data/scripts/mystery_event_club.inc
View File

@@ -1,170 +0,0 @@
MysteryEventClub_EventScript_Man::
lock
faceplayer
goto_if_set FLAG_SYS_CHAT_USED, MysteryEventClub_EventScript_GivenProfileBefore
msgbox MysteryEventClub_Text_CollectTrainerProfiles, MSGBOX_DEFAULT
goto MysteryEventClub_EventScript_AskToSeeProfile
end
MysteryEventClub_EventScript_AskToSeeProfile::
msgbox MysteryEventClub_Text_MayISeeYourProfile, MSGBOX_DEFAULT
multichoice 17, 6, MULTI_YESNOINFO_2, FALSE
switch VAR_RESULT
case 0, MysteryEventClub_EventScript_CreateProfile
case 1, MysteryEventClub_EventScript_DeclineShowProfile
case 2, MysteryEventClub_EventScript_Info
case MULTI_B_PRESSED, MysteryEventClub_EventScript_DeclineShowProfile
end
MysteryEventClub_EventScript_Info::
msgbox MysteryEventClub_Text_EasyChatExplanation, MSGBOX_DEFAULT
goto MysteryEventClub_EventScript_AskToSeeProfile
end
MysteryEventClub_EventScript_CreateProfile::
msgbox MysteryEventClub_Text_LetsSeeItThen, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
goto_if_eq MysteryEventClub_EventScript_CancelShowProfile
compare VAR_RESULT, 1
goto_if_eq MysteryEventClub_EventScript_ShowProfile
end
MysteryEventClub_EventScript_CancelShowProfile::
msgbox MysteryEventClub_Text_NotIntoItRightNow, MSGBOX_DEFAULT
release
end
MysteryEventClub_EventScript_ShowProfile::
setvar VAR_0x8004, 0
special ShowEasyChatProfile
waitmessage
delay 80
msgbox MysteryEventClub_Text_FantasticProfile, MSGBOX_DEFAULT
release
end
MysteryEventClub_EventScript_DeclineShowProfile::
msgbox MysteryEventClub_Text_ImagineYouWouldHaveWonderfulProfile, MSGBOX_DEFAULT
release
end
MysteryEventClub_EventScript_GivenProfileBefore::
msgbox MysteryEventClub_Text_YouHaveWonderfulSmile, MSGBOX_DEFAULT
goto MysteryEventClub_EventScript_AskToSeeNewProfile
end
MysteryEventClub_EventScript_AskToSeeNewProfile::
msgbox MysteryEventClub_Text_MayISeeYourNewProfile, MSGBOX_DEFAULT
multichoice 17, 6, MULTI_YESNOINFO_2, FALSE
switch VAR_RESULT
case 0, MysteryEventClub_EventScript_CreateNewProfile
case 1, MysteryEventClub_EventScript_DeclineNewProfile
case 2, MysteryEventClub_EventScript_InfoNewProfile
case MULTI_B_PRESSED, MysteryEventClub_EventScript_DeclineNewProfile
end
MysteryEventClub_EventScript_InfoNewProfile::
msgbox MysteryEventClub_Text_EasyChatExplanation, MSGBOX_DEFAULT
goto MysteryEventClub_EventScript_AskToSeeNewProfile
end
MysteryEventClub_EventScript_CreateNewProfile::
msgbox MysteryEventClub_Text_EvenBetterThanLastProfile, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
goto_if_eq MysteryEventClub_EventScript_CancelShowProfile
compare VAR_RESULT, 1
goto_if_eq MysteryEventClub_EventScript_ShowProfile
end
MysteryEventClub_EventScript_DeclineNewProfile::
msgbox MysteryEventClub_Text_LikeProfileWayItIs, MSGBOX_DEFAULT
release
end
@ Unused
MysteryEventClub_EventScript_Ret::
return
MysteryEventClub_Text_CollectTrainerProfiles:
.string "Hello there, TRAINER!\n"
.string "You've got a wonderful smile, there.\p"
.string "I have a hobby--collecting the profiles\n"
.string "of POKéMON TRAINERS.$"
MysteryEventClub_Text_MayISeeYourProfile:
.string "So, how about it?\n"
.string "May I see your profile?$"
MysteryEventClub_Text_EasyChatExplanation:
.string "You make your own profile by putting\n"
.string "together four words or phrases.\p"
.string "Here, I'll show you an example of a\n"
.string "profile using four pieces of text.\p"
.string "You can switch those four pieces with\n"
.string "other text pieces any which way you\l"
.string "like to make your own profile.\p"
.string "There are a lot of text pieces that\n"
.string "you can use.\p"
.string "They are arranged in groups like\n"
.string "POKéMON, lifestyles, and hobbies so\l"
.string "it is easier to look them up.\p"
.string "So, first, choose the group of text\n"
.string "pieces to display a list of choices.\p"
.string "Then, pick the choice you want.\p"
.string "Repeat for the remaining text choices,\n"
.string "and you'll have your very own profile.$"
MysteryEventClub_Text_LetsSeeItThen:
.string "Yes! Thank you!\n"
.string "So, let's see it, then.$"
MysteryEventClub_Text_ImagineYouWouldHaveWonderfulProfile:
.string "Oh, no, really?\p"
.string "I imagine someone like you would have\n"
.string "a wonderful profile…$"
MysteryEventClub_Text_NotIntoItRightNow:
.string "Oh? You're not into it right now?\p"
.string "Well, anytime is good by me!$"
MysteryEventClub_Text_YouHaveWonderfulSmile:
.string "Hello there, TRAINER!\n"
.string "You've got a wonderful smile.$"
MysteryEventClub_Text_MayISeeYourNewProfile:
.string "May I see your new profile?$"
MysteryEventClub_Text_EvenBetterThanLastProfile:
.string "Yes! Thank you!\p"
.string "I hope it's even better than the profile\n"
.string "you showed me before.$"
MysteryEventClub_Text_LikeProfileWayItIs:
.string "Oh, you like your profile the way it is.\p"
.string "I don't blame you--it's a wonderful\n"
.string "profile the way it is now.$"
MysteryEventClub_Text_FantasticProfile:
.string "F-fantastic!\p"
.string "Your profile, it's wonderful!\n"
.string "It really says what you're about.\p"
.string "Why, anyone hearing this profile would\n"
.string "be captivated by you!\p"
.string "Thank you!$"
@ Unused
MysteryEventClub_Text_YouKnowSecretSaying:
.string "Oh?\n"
.string "You know the secret saying!\p"
.string "That means you're now a fellow member\n"
.string "of the MYSTERY EVENT CLUB!$"

170
data/scripts/profile_man.inc Normal file
View File

@@ -0,0 +1,170 @@
ProfileMan_EventScript_Man::
lock
faceplayer
goto_if_set FLAG_SYS_CHAT_USED, ProfileMan_EventScript_GivenProfileBefore
msgbox ProfileMan_Text_CollectTrainerProfiles, MSGBOX_DEFAULT
goto ProfileMan_EventScript_AskToSeeProfile
end
ProfileMan_EventScript_AskToSeeProfile::
msgbox ProfileMan_Text_MayISeeYourProfile, MSGBOX_DEFAULT
multichoice 17, 6, MULTI_YESNOINFO_2, FALSE
switch VAR_RESULT
case 0, ProfileMan_EventScript_CreateProfile
case 1, ProfileMan_EventScript_DeclineShowProfile
case 2, ProfileMan_EventScript_Info
case MULTI_B_PRESSED, ProfileMan_EventScript_DeclineShowProfile
end
ProfileMan_EventScript_Info::
msgbox ProfileMan_Text_EasyChatExplanation, MSGBOX_DEFAULT
goto ProfileMan_EventScript_AskToSeeProfile
end
ProfileMan_EventScript_CreateProfile::
msgbox ProfileMan_Text_LetsSeeItThen, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
goto_if_eq ProfileMan_EventScript_CancelShowProfile
compare VAR_RESULT, 1
goto_if_eq ProfileMan_EventScript_ShowProfile
end
ProfileMan_EventScript_CancelShowProfile::
msgbox ProfileMan_Text_NotIntoItRightNow, MSGBOX_DEFAULT
release
end
ProfileMan_EventScript_ShowProfile::
setvar VAR_0x8004, 0
special ShowEasyChatProfile
waitmessage
delay 80
msgbox ProfileMan_Text_FantasticProfile, MSGBOX_DEFAULT
release
end
ProfileMan_EventScript_DeclineShowProfile::
msgbox ProfileMan_Text_ImagineYouWouldHaveWonderfulProfile, MSGBOX_DEFAULT
release
end
ProfileMan_EventScript_GivenProfileBefore::
msgbox ProfileMan_Text_YouHaveWonderfulSmile, MSGBOX_DEFAULT
goto ProfileMan_EventScript_AskToSeeNewProfile
end
ProfileMan_EventScript_AskToSeeNewProfile::
msgbox ProfileMan_Text_MayISeeYourNewProfile, MSGBOX_DEFAULT
multichoice 17, 6, MULTI_YESNOINFO_2, FALSE
switch VAR_RESULT
case 0, ProfileMan_EventScript_CreateNewProfile
case 1, ProfileMan_EventScript_DeclineNewProfile
case 2, ProfileMan_EventScript_InfoNewProfile
case MULTI_B_PRESSED, ProfileMan_EventScript_DeclineNewProfile
end
ProfileMan_EventScript_InfoNewProfile::
msgbox ProfileMan_Text_EasyChatExplanation, MSGBOX_DEFAULT
goto ProfileMan_EventScript_AskToSeeNewProfile
end
ProfileMan_EventScript_CreateNewProfile::
msgbox ProfileMan_Text_EvenBetterThanLastProfile, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
goto_if_eq ProfileMan_EventScript_CancelShowProfile
compare VAR_RESULT, 1
goto_if_eq ProfileMan_EventScript_ShowProfile
end
ProfileMan_EventScript_DeclineNewProfile::
msgbox ProfileMan_Text_LikeProfileWayItIs, MSGBOX_DEFAULT
release
end
@ Unused
ProfileMan_EventScript_Ret::
return
ProfileMan_Text_CollectTrainerProfiles:
.string "Hello there, TRAINER!\n"
.string "You've got a wonderful smile, there.\p"
.string "I have a hobby--collecting the profiles\n"
.string "of POKéMON TRAINERS.$"
ProfileMan_Text_MayISeeYourProfile:
.string "So, how about it?\n"
.string "May I see your profile?$"
ProfileMan_Text_EasyChatExplanation:
.string "You make your own profile by putting\n"
.string "together four words or phrases.\p"
.string "Here, I'll show you an example of a\n"
.string "profile using four pieces of text.\p"
.string "You can switch those four pieces with\n"
.string "other text pieces any which way you\l"
.string "like to make your own profile.\p"
.string "There are a lot of text pieces that\n"
.string "you can use.\p"
.string "They are arranged in groups like\n"
.string "POKéMON, lifestyles, and hobbies so\l"
.string "it is easier to look them up.\p"
.string "So, first, choose the group of text\n"
.string "pieces to display a list of choices.\p"
.string "Then, pick the choice you want.\p"
.string "Repeat for the remaining text choices,\n"
.string "and you'll have your very own profile.$"
ProfileMan_Text_LetsSeeItThen:
.string "Yes! Thank you!\n"
.string "So, let's see it, then.$"
ProfileMan_Text_ImagineYouWouldHaveWonderfulProfile:
.string "Oh, no, really?\p"
.string "I imagine someone like you would have\n"
.string "a wonderful profile…$"
ProfileMan_Text_NotIntoItRightNow:
.string "Oh? You're not into it right now?\p"
.string "Well, anytime is good by me!$"
ProfileMan_Text_YouHaveWonderfulSmile:
.string "Hello there, TRAINER!\n"
.string "You've got a wonderful smile.$"
ProfileMan_Text_MayISeeYourNewProfile:
.string "May I see your new profile?$"
ProfileMan_Text_EvenBetterThanLastProfile:
.string "Yes! Thank you!\p"
.string "I hope it's even better than the profile\n"
.string "you showed me before.$"
ProfileMan_Text_LikeProfileWayItIs:
.string "Oh, you like your profile the way it is.\p"
.string "I don't blame you--it's a wonderful\n"
.string "profile the way it is now.$"
ProfileMan_Text_FantasticProfile:
.string "F-fantastic!\p"
.string "Your profile, it's wonderful!\n"
.string "It really says what you're about.\p"
.string "Why, anyone hearing this profile would\n"
.string "be captivated by you!\p"
.string "Thank you!$"
@ Unused
ProfileMan_Text_YouKnowSecretSaying:
.string "Oh?\n"
.string "You know the secret saying!\p"
.string "That means you're now a fellow member\n"
.string "of the MYSTERY EVENT CLUB!$"

4
data/specials.inc
View File

@@ -315,7 +315,7 @@ gSpecials::
def_special IsStarterInParty
def_special CopyCurSecretBaseOwnerName_StrVar1
def_special ScriptCheckFreePokemonStorageSpace
def_special DoSealedChamberShakingEffect1
def_special DoSealedChamberShakingEffect_Long
def_special ShowDeptStoreElevatorFloorSelect
def_special InteractWithShieldOrTVDecoration
def_special IsPokerusInParty
@@ -325,7 +325,7 @@ gSpecials::
def_special BattleSetup_StartLegendaryBattle
def_special StartRegiBattle
def_special SetTrainerFacingDirection
def_special DoSealedChamberShakingEffect2
def_special DoSealedChamberShakingEffect_Short
def_special FoundBlackGlasses
def_special StartDroughtWeatherBlend
def_special DoDiveWarp

4
data/text/braille.inc
View File

@@ -1,3 +1,7 @@
@ NOTE: The brailleformat macro in this file is leftover from RS.
@ The numbers are simply skipped over. If you'd like to omit
@ this macro you must also stop it from skipping over this
@ section by editing ScrCmd_braillemessage.
Underwater_SealedChamber_Braille_GoUpHere:
brailleformat 4, 6, 26, 13, 7, 9
.braille "GO UP HERE.$"

5
data/unknown_serial_data.s
View File

@@ -1,5 +0,0 @@
.section .rodata
.align 2
gUnknown_089A3470::
.incbin "data/unknown_serial_data.bin"