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

Merge pull request #231 from GriffinRichards/doc-staticmon

Browse Source 
Document static mon scripts
This commit is contained in:
PikalaxALT
2020-01-22 11:41:14 -05:00
committed by GitHub
parent 6eec1c1cc9 a4f5f41e24
commit e97d3532d4
39 changed files with 440 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/event.inc
+7
View File
@@ -1633,3 +1633,10 @@
compare VAR_RESULT, 2
goto_if_eq \dest
.endm
.macro braillemessage_wait text:req
setvar VAR_0x8006, 0
braillemessage \text
getbraillestringwidth \text
call EventScript_BrailleCursorWaitButton
.endm
data/event_scripts.s
+3 -1
View File
@@ -1,6 +1,7 @@
#include "constants/global.h"
#include "constants/flags.h"
#include "constants/event_objects.h"
#include "constants/event_object_movement.h"
#include "constants/decorations.h"
#include "constants/items.h"
#include "constants/layouts.h"
@@ -1119,7 +1120,8 @@ Text_1A641B:: @ 81A641B
.string "All right!\n"
.string "All aboard SEAGALLOP HI-SPEED {STR_VAR_1}!$"
Text_1A6448:: @ 81A6448
@ Call for legendary bird trio
Text_Gyaoo:: @ 81A6448
.string "Gyaoo!$"
Text_MoveCanOnlyBeLearnedOnce:: @ 81A644F
data/layouts/UnusedLayout_833B6EC/border.bin → data/layouts/SeafoamIslands_B3F_CurrentStopped/border.bin
View File
data/layouts/UnusedLayout_833B6EC/map.bin → data/layouts/SeafoamIslands_B3F_CurrentStopped/map.bin
View File
data/layouts/UnusedLayout_833BE30/border.bin → data/layouts/SeafoamIslands_B4F_CurrentStopped/border.bin
View File
data/layouts/UnusedLayout_833BE30/map.bin → data/layouts/SeafoamIslands_B4F_CurrentStopped/map.bin
View File
data/layouts/layouts.json
+8 -8
View File
@@ -3128,28 +3128,28 @@
"blockdata_filepath": "data/layouts/FourIsland_PokemonDayCare/map.bin"
},
{
"id": "LAYOUT_UNUSED_LAYOUT_833B6EC",
"name": "UnusedLayout_833B6EC_Layout",
"id": "LAYOUT_SEAFOAM_ISLANDS_B3F_CURRENT_STOPPED",
"name": "SeafoamIslands_B3F_CurrentStopped_Layout",
"width": 38,
"height": 24,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_82D4A94",
"secondary_tileset": "gTileset_82D4E24",
"border_filepath": "data/layouts/UnusedLayout_833B6EC/border.bin",
"blockdata_filepath": "data/layouts/UnusedLayout_833B6EC/map.bin"
"border_filepath": "data/layouts/SeafoamIslands_B3F_CurrentStopped/border.bin",
"blockdata_filepath": "data/layouts/SeafoamIslands_B3F_CurrentStopped/map.bin"
},
{
"id": "LAYOUT_UNUSED_LAYOUT_833BE30",
"name": "UnusedLayout_833BE30_Layout",
"id": "LAYOUT_SEAFOAM_ISLANDS_B4F_CURRENT_STOPPED",
"name": "SeafoamIslands_B4F_CurrentStopped_Layout",
"width": 38,
"height": 24,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_82D4A94",
"secondary_tileset": "gTileset_82D4E24",
"border_filepath": "data/layouts/UnusedLayout_833BE30/border.bin",
"blockdata_filepath": "data/layouts/UnusedLayout_833BE30/map.bin"
"border_filepath": "data/layouts/SeafoamIslands_B4F_CurrentStopped/border.bin",
"blockdata_filepath": "data/layouts/SeafoamIslands_B4F_CurrentStopped/map.bin"
},
{
"id": "LAYOUT_MT_EMBER_EXTERIOR",
data/maps/CeruleanCave_B1F/map.json
+1 -1
View File
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1624F5",
"script": "CeruleanCave_B1F_EventScript_Mewtwo",
"flag": "FLAG_HIDE_MEWTWO"
},
{
data/maps/CeruleanCave_B1F/scripts.inc
+11 -15
View File
@@ -4,10 +4,10 @@ CeruleanCave_B1F_MapScripts:: @ 81624BE
.byte 0
CeruleanCave_B1F_OnResume:: @ 81624C9
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_1624D3
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, CeruleanCave_B1F_EventScript_TryRemoveMewtwo
end
EventScript_1624D3:: @ 81624D3
CeruleanCave_B1F_EventScript_TryRemoveMewtwo:: @ 81624D3
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
@@ -15,21 +15,21 @@ EventScript_1624D3:: @ 81624D3
return
CeruleanCave_B1F_OnTransition:: @ 81624E7
call_if_unset FLAG_FOUGHT_MEWTWO, EventScript_1624F1
call_if_unset FLAG_FOUGHT_MEWTWO, CeruleanCave_B1F_EventScript_ShowMewtwo
end
EventScript_1624F1:: @ 81624F1
CeruleanCave_B1F_EventScript_ShowMewtwo:: @ 81624F1
clearflag FLAG_HIDE_MEWTWO
return
CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
waitse
playmoncry SPECIES_MEWTWO, 2
message Text_177F9F
message CeruleanCave_B1F_Text_Mew
waitmessage
waitmoncry
delay 20
@@ -42,25 +42,21 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_162558
goto_if_eq CeruleanCave_B1F_EventScript_DefeatedMewtwo
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_162561
goto_if_eq CeruleanCave_B1F_EventScript_RanFromMewtwo
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_162561
goto_if_eq CeruleanCave_B1F_EventScript_RanFromMewtwo
setflag FLAG_FOUGHT_MEWTWO
release
end
EventScript_162558:: @ 8162558
CeruleanCave_B1F_EventScript_DefeatedMewtwo:: @ 8162558
setflag FLAG_FOUGHT_MEWTWO
goto EventScript_RemoveStaticMon
EventScript_162560:: @ 8162560
end
EventScript_162561:: @ 8162561
CeruleanCave_B1F_EventScript_RanFromMewtwo:: @ 8162561
setvar VAR_0x8004, SPECIES_MEWTWO
goto EventScript_MonFlewAway
EventScript_16256B:: @ 816256B
end
data/maps/CeruleanCave_B1F/text.inc
+1 -1
View File
@@ -1,3 +1,3 @@
Text_177F9F:: @ 8177F9F
CeruleanCave_B1F_Text_Mew:: @ 8177F9F
.string "Mew!$"
data/maps/MtEmber_Exterior/map.json
+8 -8
View File
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Exterior_EventScript_16397F",
"script": "MtEmber_Exterior_EventScript_Grunt1",
"flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Exterior_EventScript_1639F0",
"script": "MtEmber_Exterior_EventScript_Grunt2",
"flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 3,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
"script": "MtEmber_Exterior_EventScript_163AE2",
"script": "MtEmber_Exterior_EventScript_Jocelyn",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
"script": "MtEmber_Exterior_EventScript_163AB4",
"script": "MtEmber_Exterior_EventScript_Logan",
"flag": "0"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "MtEmber_Exterior_EventScript_163ACB",
"script": "MtEmber_Exterior_EventScript_Beth",
"flag": "0"
},
{
@@ -326,7 +326,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_MT_EMBER_EXTERIOR",
"var_value": 1,
"script": "MtEmber_Exterior_EventScript_163A4E"
"script": "MtEmber_Exterior_EventScript_RocketPasswordScene"
},
{
"type": "trigger",
@@ -335,7 +335,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_MT_EMBER_EXTERIOR",
"var_value": 1,
"script": "MtEmber_Exterior_EventScript_163A4E"
"script": "MtEmber_Exterior_EventScript_RocketPasswordScene"
},
{
"type": "trigger",
@@ -344,7 +344,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_MT_EMBER_EXTERIOR",
"var_value": 1,
"script": "MtEmber_Exterior_EventScript_163A4E"
"script": "MtEmber_Exterior_EventScript_RocketPasswordScene"
}
],
"bg_events": [
data/maps/MtEmber_Exterior/scripts.inc
+46 -46
View File
@@ -6,50 +6,50 @@ MtEmber_Exterior_MapScripts:: @ 8163946
MtEmber_Exterior_OnTransition:: @ 8163951
setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR
compare VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2
call_if_eq EventScript_163960
call_if_eq MtEmber_Exterior_EventScript_RocketsFaceDown
end
EventScript_163960:: @ 8163960
setobjectmovementtype 2, 8
setobjectmovementtype 3, 8
MtEmber_Exterior_EventScript_RocketsFaceDown:: @ 8163960
setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN
setobjectmovementtype 3, MOVEMENT_TYPE_FACE_DOWN
return
MtEmber_Exterior_OnLoad:: @ 8163969
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
call_if_ge EventScript_163975
call_if_ge MtEmber_Exterior_EventScript_OpenCave
end
EventScript_163975:: @ 8163975
setmetatile 42, 39, 838, 0
MtEmber_Exterior_EventScript_OpenCave:: @ 8163975
setmetatile 42, 39, METATILE_MtEmber_CaveEntrance, 0
return
MtEmber_Exterior_EventScript_16397F:: @ 816397F
MtEmber_Exterior_EventScript_Grunt1:: @ 816397F
lock
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_43, EventScript_16399E
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_43, MtEmber_Exterior_EventScript_Grunt1Defeated
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
goto_if_eq EventScript_1639A8
msgbox gUnknown_817A82A
goto_if_eq MtEmber_Exterior_EventScript_BattleGrunt1
msgbox MtEmber_Exterior_Text_WellTryDiggingHere
release
end
EventScript_16399E:: @ 816399E
msgbox gUnknown_817AA3F
MtEmber_Exterior_EventScript_Grunt1Defeated:: @ 816399E
msgbox MtEmber_Exterior_Text_Grunt1PostBattle
release
end
EventScript_1639A8:: @ 81639A8
MtEmber_Exterior_EventScript_BattleGrunt1:: @ 81639A8
applymovement 2, Movement_FacePlayer
waitmovement 0
playbgm MUS_ROCKET, 0
msgbox gUnknown_817AA06
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_43, Text_17AA34
msgbox gUnknown_817AA3F
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_44, EventScript_1639DB
msgbox MtEmber_Exterior_Text_Grunt1Intro
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_43, MtEmber_Exterior_Text_Grunt1Defeat
msgbox MtEmber_Exterior_Text_Grunt1PostBattle
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_44, MtEmber_Exterior_EventScript_DefeatedBothGrunts
release
end
EventScript_1639DB:: @ 81639DB
msgbox gUnknown_817AAD7
MtEmber_Exterior_EventScript_DefeatedBothGrunts:: @ 81639DB
msgbox MtEmber_Exterior_Text_WellRegroupDontStepInsideThere
closemessage
fadescreen FADE_TO_BLACK
removeobject 2
@@ -58,44 +58,44 @@ EventScript_1639DB:: @ 81639DB
release
end
MtEmber_Exterior_EventScript_1639F0:: @ 81639F0
MtEmber_Exterior_EventScript_Grunt2:: @ 81639F0
lock
faceplayer
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_44, EventScript_163A1B
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_44, MtEmber_Exterior_EventScript_DefeatedGrunt2
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
goto_if_eq EventScript_163A25
msgbox gUnknown_817A88C
goto_if_eq MtEmber_Exterior_EventScript_BattleGrunt2
msgbox MtEmber_Exterior_Text_YoureInTheWayGetLost
closemessage
applymovement 3, Movement_FaceOriginalDirection
waitmovement 0
release
end
EventScript_163A1B:: @ 8163A1B
msgbox gUnknown_817AA99
MtEmber_Exterior_EventScript_DefeatedGrunt2:: @ 8163A1B
msgbox MtEmber_Exterior_Text_Grunt2PostBattle
release
end
EventScript_163A25:: @ 8163A25
MtEmber_Exterior_EventScript_BattleGrunt2:: @ 8163A25
playbgm MUS_ROCKET, 0
msgbox gUnknown_817AA56
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_44, Text_17AA8A
msgbox gUnknown_817AA99
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_43, EventScript_1639DB
msgbox MtEmber_Exterior_Text_Grunt2Intro
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_44, MtEmber_Exterior_Text_Grunt2Defeat
msgbox MtEmber_Exterior_Text_Grunt2PostBattle
goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_43, MtEmber_Exterior_EventScript_DefeatedBothGrunts
release
end
MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E
MtEmber_Exterior_EventScript_RocketPasswordScene:: @ 8163A4E
lockall
textcolor 0
msgbox gUnknown_817A8B4
message Text_17A8EE
msgbox MtEmber_Exterior_Text_PunchedThroughAtLast
message MtEmber_Exterior_Text_WhatsPasswordAgain
waitmessage
playse SE_PIN
applymovement 3, Movement_QuestionMark
waitmovement 0
waitbuttonpress
msgbox gUnknown_817A970
msgbox MtEmber_Exterior_Text_FirstPasswordGoldeen
applymovement 2, Movement_WalkInPlaceFastestDown
waitmovement 0
playse SE_PIN
@@ -105,23 +105,23 @@ MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E
waitmovement 0
applymovement 3, Movement_WalkInPlaceFastestDown
waitmovement 0
call EventScript_163960
msgbox gUnknown_817A9E1
call MtEmber_Exterior_EventScript_RocketsFaceDown
msgbox MtEmber_Exterior_Text_SnoopsBeenListeningIn
setvar VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2
releaseall
end
MtEmber_Exterior_EventScript_163AB4:: @ 8163AB4
trainerbattle_single TRAINER_PKMN_RANGER_LOGAN, Text_17AB73, Text_17ABAA
msgbox gUnknown_817ABD8, MSGBOX_AUTOCLOSE
MtEmber_Exterior_EventScript_Logan:: @ 8163AB4
trainerbattle_single TRAINER_PKMN_RANGER_LOGAN, MtEmber_Exterior_Text_LoganIntro, MtEmber_Exterior_Text_LoganDefeat
msgbox MtEmber_Exterior_Text_LoganPostBattle, MSGBOX_AUTOCLOSE
end
MtEmber_Exterior_EventScript_163ACB:: @ 8163ACB
trainerbattle_single TRAINER_PKMN_RANGER_BETH, Text_17AC55, Text_17AC82
msgbox gUnknown_817ACA2, MSGBOX_AUTOCLOSE
MtEmber_Exterior_EventScript_Beth:: @ 8163ACB
trainerbattle_single TRAINER_PKMN_RANGER_BETH, MtEmber_Exterior_Text_BethIntro, MtEmber_Exterior_Text_BethDefeat
msgbox MtEmber_Exterior_Text_BethPostBattle, MSGBOX_AUTOCLOSE
end
MtEmber_Exterior_EventScript_163AE2:: @ 8163AE2
trainerbattle_single TRAINER_CRUSH_GIRL_JOCELYN, Text_17AD06, Text_17AD6B
msgbox gUnknown_817AD89, MSGBOX_AUTOCLOSE
MtEmber_Exterior_EventScript_Jocelyn:: @ 8163AE2
trainerbattle_single TRAINER_CRUSH_GIRL_JOCELYN, MtEmber_Exterior_Text_JocelynIntro, MtEmber_Exterior_Text_JocelynDefeat
msgbox MtEmber_Exterior_Text_JocelynPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/MtEmber_Exterior/text.inc
+27 -26
View File
@@ -20,7 +20,8 @@ Text_ExplosionTaught:: @ 817A756
.string "volcano…\p"
.string "What a terrifying thrill!$"
Text_17A797:: @ 817A797
@ Below 4 are unused JP versions of the above texts
Text_ExplosionTeachJP:: @ 817A797
.string "こ　この　かざんが\n"
.string "もし　だいばくはつ　したら\l"
.string "お　おれら　ひとたまりも\l"
@@ -28,72 +29,72 @@ Text_17A797:: @ 817A797
.string "こ　こわい　ついでに\n"
.string "だいばくはつ　でも　おぼえてみる？$"
Text_17A7E5:: @ 817A7E5
Text_ExplosionDeclinedJP:: @ 817A7E5
.string "や　やっぱ　こわいもんな\n"
.string "ブルブル$"
Text_17A7F7:: @ 817A7F7
Text_ExplosionWhichMonJP:: @ 817A7F7
.string "つ　つよきだね！\n"
.string "じゃあ　どの　ポケモンに　する？$"
Text_17A811:: @ 817A811
Text_ExplosionTaughtJP:: @ 817A811
.string "かざんで　だいばくはつを‥\n"
.string "す　すごい　スリル！$"
gUnknown_817A82A:: @ 817A82A
MtEmber_Exterior_Text_WellTryDiggingHere:: @ 817A82A
.string "Over here.\n"
.string "We'll try digging here.\p"
.string "That treasure the ADMINS've been\n"
.string "talking about should be here.$"
gUnknown_817A88C:: @ 817A88C
MtEmber_Exterior_Text_YoureInTheWayGetLost:: @ 817A88C
.string "What the…?\n"
.string "You're in the way. Get lost.$"
gUnknown_817A8B4:: @ 817A8B4
MtEmber_Exterior_Text_PunchedThroughAtLast:: @ 817A8B4
.string "Whew, punched through at last.\n"
.string "Let's go treasure hunting!$"
Text_17A8EE:: @ 817A8EE
MtEmber_Exterior_Text_WhatsPasswordAgain:: @ 817A8EE
.string "Any treasure we find, we haul back\n"
.string "to the WAREHOUSE, understood?\p"
.string "…Oh, and what're the passwords?\n"
.string "At the ROCKET WAREHOUSE, I mean.$"
gUnknown_817A970:: @ 817A970
MtEmber_Exterior_Text_FirstPasswordGoldeen:: @ 817A970
.string "What, you forgot the password?\n"
.string "There're actually two.\p"
.string "The first one's “GOLDEEN need\n"
.string "log.”\p"
.string "And the second one is…$"
gUnknown_817A9E1:: @ 817A9E1
MtEmber_Exterior_Text_SnoopsBeenListeningIn:: @ 817A9E1
.string "Hey!\n"
.string "This snoop's been listening in!$"
gUnknown_817AA06:: @ 817AA06
MtEmber_Exterior_Text_Grunt1Intro:: @ 817AA06
.string "You've been eavesdropping on us,\n"
.string "haven't you?$"
Text_17AA34:: @ 817AA34
MtEmber_Exterior_Text_Grunt1Defeat:: @ 817AA34
.string "Huh, what?$"
gUnknown_817AA3F:: @ 817AA3F
MtEmber_Exterior_Text_Grunt1PostBattle:: @ 817AA3F
.string "Why'd you have to win?$"
gUnknown_817AA56:: @ 817AA56
MtEmber_Exterior_Text_Grunt2Intro:: @ 817AA56
.string "Trying to horn in on our treasure?\n"
.string "Don't bet on it!$"
Text_17AA8A:: @ 817AA8A
MtEmber_Exterior_Text_Grunt2Defeat:: @ 817AA8A
.string "Wait!\n"
.string "But how?$"
gUnknown_817AA99:: @ 817AA99
MtEmber_Exterior_Text_Grunt2PostBattle:: @ 817AA99
.string "Develop amnesia conveniently and\n"
.string "forget everything you heard!$"
gUnknown_817AAD7:: @ 817AAD7
MtEmber_Exterior_Text_WellRegroupDontStepInsideThere:: @ 817AAD7
.string "What a setback…\n"
.string "We'll have to regroup.\p"
.string "You! Don't even think about taking\n"
@@ -101,43 +102,43 @@ gUnknown_817AAD7:: @ 817AAD7
.string "If you know what's good for you,\n"
.string "don't even think about this!$"
Text_17AB73:: @ 817AB73
MtEmber_Exterior_Text_LoganIntro:: @ 817AB73
.string "An active volcano is one that's\n"
.string "erupting, or about to.$"
Text_17ABAA:: @ 817ABAA
MtEmber_Exterior_Text_LoganDefeat:: @ 817ABAA
.string "Whew… That was hot!\n"
.string "Sweat's erupting from me!$"
gUnknown_817ABD8:: @ 817ABD8
MtEmber_Exterior_Text_LoganPostBattle:: @ 817ABD8
.string "They say there're over 1,500\n"
.string "active volcanoes in the world.\p"
.string "Just thinking about them makes me\n"
.string "feel all hot and gooey inside!$"
Text_17AC55:: @ 817AC55
MtEmber_Exterior_Text_BethIntro:: @ 817AC55
.string "Do you know how caves form inside\n"
.string "volcanoes?$"
Text_17AC82:: @ 817AC82
MtEmber_Exterior_Text_BethDefeat:: @ 817AC82
.string "Atchah!\n"
.string "You're shockingly good!$"
gUnknown_817ACA2:: @ 817ACA2
MtEmber_Exterior_Text_BethPostBattle:: @ 817ACA2
.string "When lava at the surface of magma\n"
.string "hardens, and the magma inside flows\l"
.string "out, caverns are left behind.$"
Text_17AD06:: @ 817AD06
MtEmber_Exterior_Text_JocelynIntro:: @ 817AD06
.string "I've been in training so I can mend\n"
.string "my broken heart…\p"
.string "It toughened me up physically at\n"
.string "least! Hi-yah!$"
Text_17AD6B:: @ 817AD6B
MtEmber_Exterior_Text_JocelynDefeat:: @ 817AD6B
.string "I think I tried to overdo it…$"
gUnknown_817AD89:: @ 817AD89
MtEmber_Exterior_Text_JocelynPostBattle:: @ 817AD89
.string "The way you battle, it reminds me\n"
.string "of the guy who dumped me…$"
data/maps/MtEmber_RubyPath_B3F/scripts.inc
+3 -3
View File
@@ -1,12 +1,12 @@
MtEmber_RubyPath_B3F_MapScripts:: @ 8163C48
.byte 0
MtEmber_RubyPath_B3F_EventScript_163C49:: @ 8163C49
MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49
@ Odd that this is here and not in MtEmber_RubyPath_B5F/scripts.inc
MtEmber_RubyPath_B5F_EventScript_Ruby:: @ 8163C49
lock
faceplayer
setflag FLAG_GOT_RUBY
removeobject 1
giveitem_msg gUnknown_817ADC5, ITEM_RUBY, 1, MUS_FAN5
giveitem_msg MtEmber_RubyPath_B3F_Text_FoundARuby, ITEM_RUBY, 1, MUS_FAN5
release
end
data/maps/MtEmber_RubyPath_B3F/text.inc
+1 -1
View File
@@ -1,3 +1,3 @@
gUnknown_817ADC5:: @ 817ADC5
MtEmber_RubyPath_B3F_Text_FoundARuby:: @ 817ADC5
.string "{PLAYER} found a RUBY!$"
data/maps/MtEmber_RubyPath_B4F/map.json
+26 -26
View File
@@ -36,182 +36,182 @@
"x": 3,
"y": 7,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_1638EC"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleABC"
},
{
"type": "bg_event_type_1",
"x": 4,
"y": 7,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_1638EC"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleABC"
},
{
"type": "bg_event_type_1",
"x": 5,
"y": 7,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_1638EC"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleABC"
},
{
"type": "bg_event_type_1",
"x": 4,
"y": 9,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_1638F5"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleGHI"
},
{
"type": "bg_event_type_1",
"x": 3,
"y": 9,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_1638F5"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleGHI"
},
{
"type": "bg_event_type_1",
"x": 5,
"y": 9,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_1638F5"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleGHI"
},
{
"type": "bg_event_type_1",
"x": 3,
"y": 11,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_1638FE"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleMNO"
},
{
"type": "bg_event_type_1",
"x": 4,
"y": 11,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_1638FE"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleMNO"
},
{
"type": "bg_event_type_1",
"x": 5,
"y": 11,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_1638FE"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleMNO"
},
{
"type": "bg_event_type_1",
"x": 3,
"y": 13,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163907"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleTUV"
},
{
"type": "bg_event_type_1",
"x": 4,
"y": 13,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163907"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleTUV"
},
{
"type": "bg_event_type_1",
"x": 5,
"y": 13,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163907"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleTUV"
},
{
"type": "bg_event_type_1",
"x": 7,
"y": 7,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163910"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleDEF"
},
{
"type": "bg_event_type_1",
"x": 8,
"y": 7,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163910"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleDEF"
},
{
"type": "bg_event_type_1",
"x": 9,
"y": 7,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163910"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleDEF"
},
{
"type": "bg_event_type_1",
"x": 7,
"y": 9,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163919"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleJKL"
},
{
"type": "bg_event_type_1",
"x": 8,
"y": 9,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163919"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleJKL"
},
{
"type": "bg_event_type_1",
"x": 9,
"y": 9,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163919"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleJKL"
},
{
"type": "bg_event_type_1",
"x": 7,
"y": 11,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163922"
"script": "MtEmber_RubyPath_B4F_EventScript_BraillePQRS"
},
{
"type": "bg_event_type_1",
"x": 11,
"y": 7,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163934"
"script": "MtEmber_RubyPath_B4F_EventScript_BraillePeriod"
},
{
"type": "bg_event_type_1",
"x": 11,
"y": 9,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_16393D"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleComma"
},
{
"type": "bg_event_type_1",
"x": 8,
"y": 11,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163922"
"script": "MtEmber_RubyPath_B4F_EventScript_BraillePQRS"
},
{
"type": "bg_event_type_1",
"x": 9,
"y": 11,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_163922"
"script": "MtEmber_RubyPath_B4F_EventScript_BraillePQRS"
},
{
"type": "bg_event_type_1",
"x": 7,
"y": 13,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_16392B"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ"
},
{
"type": "bg_event_type_1",
"x": 9,
"y": 13,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_16392B"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ"
},
{
"type": "bg_event_type_1",
"x": 8,
"y": 13,
"elevation": 0,
"script": "MtEmber_RubyPath_B4F_EventScript_16392B"
"script": "MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ"
}
]
}
data/maps/MtEmber_RubyPath_B4F/scripts.inc
+20 -20
View File
@@ -1,72 +1,72 @@
MtEmber_RubyPath_B4F_MapScripts:: @ 81638EB
.byte 0
MtEmber_RubyPath_B4F_EventScript_1638EC:: @ 81638EC
MtEmber_RubyPath_B4F_EventScript_BrailleABC:: @ 81638EC
lockall
braillemessage gUnknown_81A929F
braillemessage Braille_Text_ABC
waitbuttonpress
releaseall
end
MtEmber_RubyPath_B4F_EventScript_1638F5:: @ 81638F5
MtEmber_RubyPath_B4F_EventScript_BrailleGHI:: @ 81638F5
lockall
braillemessage gUnknown_81A92A3
braillemessage Braille_Text_GHI
waitbuttonpress
releaseall
end
MtEmber_RubyPath_B4F_EventScript_1638FE:: @ 81638FE
MtEmber_RubyPath_B4F_EventScript_BrailleMNO:: @ 81638FE
lockall
braillemessage gUnknown_81A92A7
braillemessage Braille_Text_MNO
waitbuttonpress
releaseall
end
MtEmber_RubyPath_B4F_EventScript_163907:: @ 8163907
MtEmber_RubyPath_B4F_EventScript_BrailleTUV:: @ 8163907
lockall
braillemessage gUnknown_81A92AB
braillemessage Braille_Text_TUV
waitbuttonpress
releaseall
end
MtEmber_RubyPath_B4F_EventScript_163910:: @ 8163910
MtEmber_RubyPath_B4F_EventScript_BrailleDEF:: @ 8163910
lockall
braillemessage gUnknown_81A92AF
braillemessage Braille_Text_DEF
waitbuttonpress
releaseall
end
MtEmber_RubyPath_B4F_EventScript_163919:: @ 8163919
MtEmber_RubyPath_B4F_EventScript_BrailleJKL:: @ 8163919
lockall
braillemessage gUnknown_81A92B3
braillemessage Braille_Text_JKL
waitbuttonpress
releaseall
end
MtEmber_RubyPath_B4F_EventScript_163922:: @ 8163922
MtEmber_RubyPath_B4F_EventScript_BraillePQRS:: @ 8163922
lockall
braillemessage gUnknown_81A92B7
braillemessage Braille_Text_PQRS
waitbuttonpress
releaseall
end
MtEmber_RubyPath_B4F_EventScript_16392B:: @ 816392B
MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ:: @ 816392B
lockall
braillemessage gUnknown_81A92BC
braillemessage Braille_Text_WXYZ
waitbuttonpress
releaseall
end
MtEmber_RubyPath_B4F_EventScript_163934:: @ 8163934
MtEmber_RubyPath_B4F_EventScript_BraillePeriod:: @ 8163934
lockall
braillemessage gUnknown_81A92C1
braillemessage Braille_Text_Period
waitbuttonpress
releaseall
end
MtEmber_RubyPath_B4F_EventScript_16393D:: @ 816393D
MtEmber_RubyPath_B4F_EventScript_BrailleComma:: @ 816393D
lockall
braillemessage gUnknown_81A92C3
braillemessage Braille_Text_Comma
waitbuttonpress
releaseall
end
data/maps/MtEmber_RubyPath_B5F/map.json
+2 -2
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B5F_EventScript_163C49",
"script": "MtEmber_RubyPath_B5F_EventScript_Ruby",
"flag": "FLAG_HIDE_RUBY"
}
],
@@ -43,7 +43,7 @@
"x": 7,
"y": 2,
"elevation": 0,
"script": "MtEmber_RubyPath_B5F_EventScript_163BAB"
"script": "MtEmber_RubyPath_B5F_EventScript_BrailleMessage"
}
]
}
data/maps/MtEmber_RubyPath_B5F/scripts.inc
+9 -30
View File
@@ -1,38 +1,17 @@
MtEmber_RubyPath_B5F_MapScripts:: @ 8163BAA
.byte 0
MtEmber_RubyPath_B5F_EventScript_163BAB:: @ 8163BAB
MtEmber_RubyPath_B5F_EventScript_BrailleMessage:: @ 8163BAB
lockall
setvar VAR_0x8005, 130
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92C5
getbraillestringwidth gUnknown_81A92C5
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92D0
getbraillestringwidth gUnknown_81A92D0
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92DC
getbraillestringwidth gUnknown_81A92DC
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92E6
getbraillestringwidth gUnknown_81A92E6
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92F2
getbraillestringwidth gUnknown_81A92F2
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92FE
getbraillestringwidth gUnknown_81A92FE
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A930A
getbraillestringwidth gUnknown_81A930A
call EventScript_BrailleCursorWaitButton
braillemessage gUnknown_81A9316
braillemessage_wait Braille_Text_Everything
braillemessage_wait Braille_Text_HasMeaning1
braillemessage_wait Braille_Text_Existence
braillemessage_wait Braille_Text_HasMeaning2
braillemessage_wait Braille_Text_BeingAlive
braillemessage_wait Braille_Text_HasMeaning3
braillemessage_wait Braille_Text_HaveDreams
braillemessage Braille_Text_UsePower
waitbuttonpress
releaseall
end
data/maps/MtEmber_Summit/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Summit_EventScript_163B33",
"script": "MtEmber_Summit_EventScript_Moltres",
"flag": "FLAG_HIDE_MOLTRES"
},
{
data/maps/MtEmber_Summit/scripts.inc
+11 -11
View File
@@ -4,10 +4,10 @@ MtEmber_Summit_MapScripts:: @ 8163AFC
.byte 0
MtEmber_Summit_OnResume:: @ 8163B07
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_163B11
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, MtEmber_Summit_EventScript_TryRemoveMoltres
end
EventScript_163B11:: @ 8163B11
MtEmber_Summit_EventScript_TryRemoveMoltres:: @ 8163B11
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
@@ -15,14 +15,14 @@ EventScript_163B11:: @ 8163B11
return
MtEmber_Summit_OnTransition:: @ 8163B25
call_if_unset FLAG_FOUGHT_MOLTRES, EventScript_163B2F
call_if_unset FLAG_FOUGHT_MOLTRES, MtEmber_Summit_EventScript_ShowMoltres
end
EventScript_163B2F:: @ 8163B2F
MtEmber_Summit_EventScript_ShowMoltres:: @ 8163B2F
clearflag FLAG_HIDE_MOLTRES
return
MtEmber_Summit_EventScript_163B33:: @ 8163B33
MtEmber_Summit_EventScript_Moltres:: @ 8163B33
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
@@ -30,7 +30,7 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33
setwildbattle SPECIES_MOLTRES, 50, ITEM_NONE
waitse
playmoncry SPECIES_MOLTRES, 2
message Text_1A6448
message Text_Gyaoo
waitmessage
waitmoncry
delay 10
@@ -42,21 +42,21 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_163B96
goto_if_eq MtEmber_Summit_EventScript_DefeatedMoltres
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_163B9F
goto_if_eq MtEmber_Summit_EventScript_RanFromMoltres
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_163B9F
goto_if_eq MtEmber_Summit_EventScript_RanFromMoltres
setflag FLAG_FOUGHT_MOLTRES
release
end
EventScript_163B96:: @ 8163B96
MtEmber_Summit_EventScript_DefeatedMoltres:: @ 8163B96
setflag FLAG_FOUGHT_MOLTRES
goto EventScript_RemoveStaticMon
end
EventScript_163B9F:: @ 8163B9F
MtEmber_Summit_EventScript_RanFromMoltres:: @ 8163B9F
setvar VAR_0x8004, SPECIES_MOLTRES
goto EventScript_MonFlewAway
end
data/maps/PowerPlant/map.json
+3 -3
View File
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PowerPlant_EventScript_1637B8",
"script": "PowerPlant_EventScript_Zapdos",
"flag": "FLAG_HIDE_ZAPDOS"
},
{
@@ -101,7 +101,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PowerPlant_EventScript_16388D",
"script": "PowerPlant_EventScript_Electrode2",
"flag": "FLAG_HIDE_POWER_PLANT_ELECTRODE_2"
},
{
@@ -114,7 +114,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PowerPlant_EventScript_16382F",
"script": "PowerPlant_EventScript_Electrode1",
"flag": "FLAG_HIDE_POWER_PLANT_ELECTRODE_1"
}
],
data/maps/PowerPlant/scripts.inc
+25 -25
View File
@@ -4,10 +4,10 @@ PowerPlant_MapScripts:: @ 8163764
.byte 0
PowerPlant_OnResume:: @ 816376F
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_163779
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, PowerPlant_EventScript_TryRemoveStaticMon
end
EventScript_163779:: @ 8163779
PowerPlant_EventScript_TryRemoveStaticMon:: @ 8163779
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
@@ -16,24 +16,24 @@ EventScript_163779:: @ 8163779
PowerPlant_OnTransition:: @ 816378D
setworldmapflag FLAG_WORLD_MAP_POWER_PLANT
call_if_unset FLAG_FOUGHT_ZAPDOS, EventScript_1637AC
call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1, EventScript_1637B0
call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2, EventScript_1637B4
call_if_unset FLAG_FOUGHT_ZAPDOS, PowerPlant_EventScript_ShowZapdos
call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1, PowerPlant_EventScript_ShowElectrode1
call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2, PowerPlant_EventScript_ShowElectrode2
end
EventScript_1637AC:: @ 81637AC
PowerPlant_EventScript_ShowZapdos:: @ 81637AC
clearflag FLAG_HIDE_ZAPDOS
return
EventScript_1637B0:: @ 81637B0
PowerPlant_EventScript_ShowElectrode1:: @ 81637B0
clearflag FLAG_HIDE_POWER_PLANT_ELECTRODE_1
return
EventScript_1637B4:: @ 81637B4
PowerPlant_EventScript_ShowElectrode2:: @ 81637B4
clearflag FLAG_HIDE_POWER_PLANT_ELECTRODE_2
return
PowerPlant_EventScript_1637B8:: @ 81637B8
PowerPlant_EventScript_Zapdos:: @ 81637B8
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
@@ -41,7 +41,7 @@ PowerPlant_EventScript_1637B8:: @ 81637B8
setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE
waitse
playmoncry SPECIES_ZAPDOS, 2
message Text_1A6448
message Text_Gyaoo
waitmessage
waitmoncry
delay 10
@@ -53,26 +53,26 @@ PowerPlant_EventScript_1637B8:: @ 81637B8
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_16381B
goto_if_eq PowerPlant_EventScript_DefeatedZapdos
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_163824
goto_if_eq PowerPlant_EventScript_RanFromZapdos
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_163824
goto_if_eq PowerPlant_EventScript_RanFromZapdos
setflag FLAG_FOUGHT_ZAPDOS
release
end
EventScript_16381B:: @ 816381B
PowerPlant_EventScript_DefeatedZapdos:: @ 816381B
setflag FLAG_FOUGHT_ZAPDOS
goto EventScript_RemoveStaticMon
end
EventScript_163824:: @ 8163824
PowerPlant_EventScript_RanFromZapdos:: @ 8163824
setvar VAR_0x8004, SPECIES_ZAPDOS
goto EventScript_MonFlewAway
end
PowerPlant_EventScript_16382F:: @ 816382F
PowerPlant_EventScript_Electrode1:: @ 816382F
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
@@ -87,21 +87,21 @@ PowerPlant_EventScript_16382F:: @ 816382F
special sub_8112364
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_163884
goto_if_eq PowerPlant_EventScript_FoughtElectrode1
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_163884
goto_if_eq PowerPlant_EventScript_FoughtElectrode1
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_163884
goto_if_eq PowerPlant_EventScript_FoughtElectrode1
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1
release
end
EventScript_163884:: @ 8163884
PowerPlant_EventScript_FoughtElectrode1:: @ 8163884
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1
goto EventScript_RemoveStaticMon
end
PowerPlant_EventScript_16388D:: @ 816388D
PowerPlant_EventScript_Electrode2:: @ 816388D
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
@@ -116,16 +116,16 @@ PowerPlant_EventScript_16388D:: @ 816388D
special sub_8112364
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_1638E2
goto_if_eq PowerPlant_EventScript_FoughtElectrode2
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_1638E2
goto_if_eq PowerPlant_EventScript_FoughtElectrode2
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_1638E2
goto_if_eq PowerPlant_EventScript_FoughtElectrode2
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2
release
end
EventScript_1638E2:: @ 81638E2
PowerPlant_EventScript_FoughtElectrode2:: @ 81638E2
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2
goto EventScript_RemoveStaticMon
end
data/maps/Route12/map.json
+3 -3
View File
@@ -91,7 +91,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route12_EventScript_168014",
"script": "Route12_EventScript_Snorlax",
"flag": "FLAG_HIDE_ROUTE_12_SNORLAX"
},
{
@@ -249,14 +249,14 @@
"x": 17,
"y": 13,
"elevation": 0,
"script": "Route12_EventScript_1680A3"
"script": "Route12_EventScript_RouteSign"
},
{
"type": "bg_event_type_0",
"x": 15,
"y": 69,
"elevation": 0,
"script": "Route12_EventScript_1680AC"
"script": "Route12_EventScript_FishingSign"
},
{
"type": "hidden_item",
data/maps/Route12/scripts.inc
+18 -18
View File
@@ -3,22 +3,22 @@ Route12_MapScripts:: @ 8168000
.byte 0
Route12_OnResume:: @ 8168006
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_168010
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, Route12_EventScript_TryRemoveSnorlax
end
EventScript_168010:: @ 8168010
Route12_EventScript_TryRemoveSnorlax:: @ 8168010
removeobject VAR_LAST_TALKED
return
Route12_EventScript_168014:: @ 8168014
Route12_EventScript_Snorlax:: @ 8168014
lock
faceplayer
goto_if_unset FLAG_GOT_POKE_FLUTE, EventScript_168099
goto_if_unset FLAG_GOT_POKE_FLUTE, Route12_EventScript_SnorlaxNoPokeFlute
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
msgbox gUnknown_81853CC, MSGBOX_YESNO
msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16808D
goto_if_eq Route12_EventScript_DontUsePokeFlute
call EventScript_AwakenSnorlax
setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
waitse
@@ -32,32 +32,32 @@ Route12_EventScript_168014:: @ 8168014
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_16808F
goto_if_eq Route12_EventScript_FoughtSnorlax
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_16808F
goto_if_eq Route12_EventScript_FoughtSnorlax
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_16808F
goto_if_eq Route12_EventScript_FoughtSnorlax
release
end
EventScript_16808D:: @ 816808D
Route12_EventScript_DontUsePokeFlute:: @ 816808D
release
end
EventScript_16808F:: @ 816808F
msgbox gUnknown_8185383
Route12_EventScript_FoughtSnorlax:: @ 816808F
msgbox Text_SnorlaxReturnedToMountains
release
end
EventScript_168099:: @ 8168099
msgbox gUnknown_8185317
Route12_EventScript_SnorlaxNoPokeFlute:: @ 8168099
msgbox Route12_Text_MonSprawledOutInSlumber
release
end
Route12_EventScript_1680A3:: @ 81680A3
msgbox gUnknown_8185797, MSGBOX_SIGN
Route12_EventScript_RouteSign:: @ 81680A3
msgbox Route12_Text_RouteSign, MSGBOX_SIGN
end
Route12_EventScript_1680AC:: @ 81680AC
msgbox gUnknown_81857B3, MSGBOX_SIGN
Route12_EventScript_FishingSign:: @ 81680AC
msgbox Route12_Text_SportfishingArea, MSGBOX_SIGN
end
data/maps/Route12/text.inc
+5 -5
View File
@@ -1,4 +1,4 @@
gUnknown_8185317:: @ 8185317
Route12_Text_MonSprawledOutInSlumber:: @ 8185317
.string "A POKéMON is sprawled out in\n"
.string "a deep and comfortable slumber.$"
@@ -6,12 +6,12 @@ Text_SnorlaxWokeUp:: @ 8185354
.string "SNORLAX woke up!\p"
.string "It attacked in a grumpy rage!$"
gUnknown_8185383:: @ 8185383
Text_SnorlaxReturnedToMountains:: @ 8185383
.string "SNORLAX calmed down.\n"
.string "It gave a huge yawn…\l"
.string "And returned to the mountains.$"
gUnknown_81853CC:: @ 81853CC
Text_WantToUsePokeFlute:: @ 81853CC
.string "Want to use the POKé FLUTE?$"
Text_PlayedPokeFlute:: @ 81853E8
@@ -102,10 +102,10 @@ Text_18574D:: @ 818574D
.string "I catch them all the time, sure.\n"
.string "But, boy are they wimpy.$"
gUnknown_8185797:: @ 8185797
Route12_Text_RouteSign:: @ 8185797
.string "ROUTE 12 \n"
.string "North to LAVENDER$"
gUnknown_81857B3:: @ 81857B3
Route12_Text_SportfishingArea:: @ 81857B3
.string "SPORTFISHING AREA$"
data/maps/Route16/map.json
+3 -3
View File
@@ -151,7 +151,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route16_EventScript_168121",
"script": "Route16_EventScript_Snorlax",
"flag": "FLAG_HIDE_ROUTE_16_SNORLAX"
}
],
@@ -199,14 +199,14 @@
"x": 6,
"y": 17,
"elevation": 0,
"script": "Route16_EventScript_1681B6"
"script": "Route16_EventScript_RouteSign"
},
{
"type": "bg_event_type_0",
"x": 33,
"y": 11,
"elevation": 0,
"script": "Route16_EventScript_1681AD"
"script": "Route16_EventScript_CyclingRoadSign"
},
{
"type": "hidden_item",
data/maps/Route16/scripts.inc
+22 -22
View File
@@ -5,39 +5,39 @@ Route16_MapScripts:: @ 81680E5
.byte 0
Route16_OnResume:: @ 81680F5
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_1680FF
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, Route16_EventScript_RemoveSnorlax
end
EventScript_1680FF:: @ 81680FF
Route16_EventScript_RemoveSnorlax:: @ 81680FF
removeobject VAR_LAST_TALKED
return
Route16_OnTransition:: @ 8168103
compare VAR_MAP_SCENE_ROUTE16, 1
call_if_eq EventScript_16810F
call_if_eq Route16_EventScript_EnterCyclingRoad
end
EventScript_16810F:: @ 816810F
Route16_EventScript_EnterCyclingRoad:: @ 816810F
setflag FLAG_SYS_ON_CYCLING_ROAD
return
Route16_OnWarp:: @ 8168113
map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16811D
map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route16_EventScript_WarpIntoCyclingRoad
.2byte 0
EventScript_16811D:: @ 816811D
Route16_EventScript_WarpIntoCyclingRoad:: @ 816811D
special Special_ForcePlayerOntoBike
end
Route16_EventScript_168121:: @ 8168121
Route16_EventScript_Snorlax:: @ 8168121
lock
faceplayer
goto_if_unset FLAG_GOT_POKE_FLUTE, EventScript_1681A3
goto_if_unset FLAG_GOT_POKE_FLUTE, Route16_EventScript_SnorlaxNoPokeFlute
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
msgbox gUnknown_81853CC, MSGBOX_YESNO
msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_168197
goto_if_eq Route16_EventScript_DontUsePokeFlute
call EventScript_AwakenSnorlax
setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
waitse
@@ -50,32 +50,32 @@ Route16_EventScript_168121:: @ 8168121
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_168199
goto_if_eq Route16_EventScript_FoughtSnorlax
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_168199
goto_if_eq Route16_EventScript_FoughtSnorlax
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_168199
goto_if_eq Route16_EventScript_FoughtSnorlax
release
end
EventScript_168197:: @ 8168197
Route16_EventScript_DontUsePokeFlute:: @ 8168197
release
end
EventScript_168199:: @ 8168199
msgbox gUnknown_8185383
Route16_EventScript_FoughtSnorlax:: @ 8168199
msgbox Text_SnorlaxReturnedToMountains
release
end
EventScript_1681A3:: @ 81681A3
msgbox gUnknown_8186F3D
Route16_EventScript_SnorlaxNoPokeFlute:: @ 81681A3
msgbox Route16_Text_MonSprawledOutInSlumber
release
end
Route16_EventScript_1681AD:: @ 81681AD
msgbox gUnknown_8186F7A, MSGBOX_SIGN
Route16_EventScript_CyclingRoadSign:: @ 81681AD
msgbox Route16_Text_CyclingRoadSign, MSGBOX_SIGN
end
Route16_EventScript_1681B6:: @ 81681B6
msgbox gUnknown_8186F98, MSGBOX_SIGN
Route16_EventScript_RouteSign:: @ 81681B6
msgbox Route16_Text_RouteSign, MSGBOX_SIGN
end
data/maps/Route16/text.inc
+3 -3
View File
@@ -99,15 +99,15 @@ Text_186EC7:: @ 8186EC7
.string "They're great for startling people.\n"
.string "And, they bite, too.$"
gUnknown_8186F3D:: @ 8186F3D
Route16_Text_MonSprawledOutInSlumber:: @ 8186F3D
.string "A POKéMON is sprawled out in\n"
.string "a deep and comfortable slumber.$"
gUnknown_8186F7A:: @ 8186F7A
Route16_Text_CyclingRoadSign:: @ 8186F7A
.string "Enjoy the slope!\n"
.string "CYCLING ROAD$"
gUnknown_8186F98:: @ 8186F98
Route16_Text_RouteSign:: @ 8186F98
.string "ROUTE 16\n"
.string "CELADON CITY - FUCHSIA CITY$"
data/maps/SeafoamIslands_B3F/scripts.inc
+31 -29
View File
@@ -1,71 +1,73 @@
.equ NUM_BOULDERS_PRESENT, VAR_TEMP_2
SeafoamIslands_B3F_MapScripts:: @ 8162F4F
map_script MAP_SCRIPT_ON_TRANSITION, SeafoamIslands_B3F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, SeafoamIslands_B3F_OnFrame
.byte 0
SeafoamIslands_B3F_OnTransition:: @ 8162F5A
call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, EventScript_162F6D
call_if_set FLAG_STOPPED_SEAFOAM_B3F_CURRENT, EventScript_162F94
call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, SeafoamIslands_B3F_EventScript_CheckStoppedCurrent
call_if_set FLAG_STOPPED_SEAFOAM_B3F_CURRENT, SeafoamIslands_B3F_EventScript_SetNoCurrentLayout
end
EventScript_162F6D:: @ 8162F6D
setvar VAR_TEMP_2, 0
call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_1, EventScript_162FF0
call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_2, EventScript_162FF0
compare VAR_TEMP_2, 2
call_if_eq EventScript_162F90
SeafoamIslands_B3F_EventScript_CheckStoppedCurrent:: @ 8162F6D
setvar NUM_BOULDERS_PRESENT, 0
call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_1, SeafoamIslands_B3F_EventScript_AddBoulderPresent
call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_2, SeafoamIslands_B3F_EventScript_AddBoulderPresent
compare NUM_BOULDERS_PRESENT, 2
call_if_eq SeafoamIslands_B3F_EventScript_StoppedCurrent
return
EventScript_162F90:: @ 8162F90
SeafoamIslands_B3F_EventScript_StoppedCurrent:: @ 8162F90
setflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT
return
EventScript_162F94:: @ 8162F94
setmaplayoutindex LAYOUT_UNUSED_LAYOUT_833B6EC
SeafoamIslands_B3F_EventScript_SetNoCurrentLayout:: @ 8162F94
setmaplayoutindex LAYOUT_SEAFOAM_ISLANDS_B3F_CURRENT_STOPPED
return
SeafoamIslands_B3F_OnFrame:: @ 8162F98
map_script_2 VAR_TEMP_1, 1, EventScript_162FA2
map_script_2 VAR_TEMP_1, 1, SeafoamIslands_B3F_EventScript_EnterByFalling
.2byte 0
EventScript_162FA2:: @ 8162FA2
SeafoamIslands_B3F_EventScript_EnterByFalling:: @ 8162FA2
lockall
setvar VAR_TEMP_2, 0
call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_1, EventScript_162FF0
call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_2, EventScript_162FF0
compare VAR_TEMP_2, 2
goto_if_eq EventScript_16300C
setvar NUM_BOULDERS_PRESENT, 0
call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_1, SeafoamIslands_B3F_EventScript_AddBoulderPresent
call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_2, SeafoamIslands_B3F_EventScript_AddBoulderPresent
compare NUM_BOULDERS_PRESENT, 2
goto_if_eq SeafoamIslands_B3F_EventScript_CurrentBlocked
getplayerxy VAR_0x8008, VAR_0x8009
compare VAR_0x8008, 24
call_if_lt EventScript_162FF6
call_if_lt SeafoamIslands_B3F_EventScript_RideCurrentFar
compare VAR_0x8008, 24
call_if_ge EventScript_163001
call_if_ge SeafoamIslands_B3F_EventScript_RideCurrentClose
setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1
warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21
waitstate
releaseall
end
EventScript_162FF0:: @ 8162FF0
addvar VAR_TEMP_2, 1
SeafoamIslands_B3F_EventScript_AddBoulderPresent:: @ 8162FF0
addvar NUM_BOULDERS_PRESENT, 1
return
EventScript_162FF6:: @ 8162FF6
applymovement OBJ_EVENT_ID_PLAYER, Movement_163013
SeafoamIslands_B3F_EventScript_RideCurrentFar:: @ 8162FF6
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B3F_Movement_RideCurrentFar
waitmovement 0
return
EventScript_163001:: @ 8163001
applymovement OBJ_EVENT_ID_PLAYER, Movement_163021
SeafoamIslands_B3F_EventScript_RideCurrentClose:: @ 8163001
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B3F_Movement_RideCurrentClose
waitmovement 0
return
EventScript_16300C:: @ 816300C
SeafoamIslands_B3F_EventScript_CurrentBlocked:: @ 816300C
setvar VAR_TEMP_1, 0
releaseall
end
Movement_163013:: @ 8163013
SeafoamIslands_B3F_Movement_RideCurrentFar:: @ 8163013
walk_fast_down
walk_fast_down
walk_fast_down
@@ -81,7 +83,7 @@ Movement_163013:: @ 8163013
walk_fast_down
step_end
Movement_163021:: @ 8163021
SeafoamIslands_B3F_Movement_RideCurrentClose:: @ 8163021
walk_fast_down
walk_fast_down
walk_fast_down
data/maps/SeafoamIslands_B4F/map.json
+6 -6
View File
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SeafoamIslands_B4F_EventScript_1631AC",
"script": "SeafoamIslands_B4F_EventScript_Articuno",
"flag": "FLAG_HIDE_ARTICUNO"
},
{
@@ -104,7 +104,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F",
"var_value": 0,
"script": "SeafoamIslands_B4F_EventScript_16319D"
"script": "SeafoamIslands_B4F_EventScript_UpwardCurrent"
},
{
"type": "trigger",
@@ -113,7 +113,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F",
"var_value": 0,
"script": "SeafoamIslands_B4F_EventScript_16319D"
"script": "SeafoamIslands_B4F_EventScript_UpwardCurrent"
},
{
"type": "trigger",
@@ -122,7 +122,7 @@
"elevation": 1,
"var": "VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F",
"var_value": 0,
"script": "SeafoamIslands_B4F_EventScript_16319D"
"script": "SeafoamIslands_B4F_EventScript_UpwardCurrent"
}
],
"bg_events": [
@@ -141,14 +141,14 @@
"x": 30,
"y": 2,
"elevation": 0,
"script": "SeafoamIslands_B4F_EventScript_16322C"
"script": "SeafoamIslands_B4F_EventScript_FastCurrentSign"
},
{
"type": "bg_event_type_0",
"x": 14,
"y": 18,
"elevation": 0,
"script": "SeafoamIslands_B4F_EventScript_163223"
"script": "SeafoamIslands_B4F_EventScript_BoulderHintSign"
}
]
}
data/maps/SeafoamIslands_B4F/scripts.inc
+66 -65
View File
@@ -1,3 +1,5 @@
.equ NUM_BOULDERS_PRESENT, VAR_TEMP_2
SeafoamIslands_B4F_MapScripts:: @ 816302E
map_script MAP_SCRIPT_ON_TRANSITION, SeafoamIslands_B4F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, SeafoamIslands_B4F_OnResume
@@ -7,10 +9,10 @@ SeafoamIslands_B4F_MapScripts:: @ 816302E
.byte 0
SeafoamIslands_B4F_OnResume:: @ 8163048
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_163052
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, SeafoamIslands_B4F_EventScript_TryRemoveArticuno
end
EventScript_163052:: @ 8163052
SeafoamIslands_B4F_EventScript_TryRemoveArticuno:: @ 8163052
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
@@ -18,109 +20,111 @@ EventScript_163052:: @ 8163052
return
SeafoamIslands_B4F_OnTransition:: @ 8163066
call_if_unset FLAG_FOUGHT_ARTICUNO, EventScript_1630AD
call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, EventScript_163082
call_if_set FLAG_STOPPED_SEAFOAM_B4F_CURRENT, EventScript_1630A9
call_if_unset FLAG_FOUGHT_ARTICUNO, SeafoamIslands_B4F_EventScript_ShowArticuno
call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, SeafoamIslands_B4F_EventScript_CheckStoppedCurrent
call_if_set FLAG_STOPPED_SEAFOAM_B4F_CURRENT, SeafoamIslands_B4F_EventScript_SetNoCurrentLayout
end
EventScript_163082:: @ 8163082
setvar VAR_TEMP_2, 0
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, EventScript_163169
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, EventScript_163169
compare VAR_TEMP_2, 2
call_if_eq EventScript_1630A5
SeafoamIslands_B4F_EventScript_CheckStoppedCurrent:: @ 8163082
setvar NUM_BOULDERS_PRESENT, 0
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, SeafoamIslands_B4F_EventScript_AddBoulderPresent
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, SeafoamIslands_B4F_EventScript_AddBoulderPresent
compare NUM_BOULDERS_PRESENT, 2
call_if_eq SeafoamIslands_B4F_EventScript_StoppedCurrent
return
EventScript_1630A5:: @ 81630A5
SeafoamIslands_B4F_EventScript_StoppedCurrent:: @ 81630A5
setflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT
return
EventScript_1630A9:: @ 81630A9
setmaplayoutindex LAYOUT_UNUSED_LAYOUT_833BE30
SeafoamIslands_B4F_EventScript_SetNoCurrentLayout:: @ 81630A9
setmaplayoutindex LAYOUT_SEAFOAM_ISLANDS_B4F_CURRENT_STOPPED
return
EventScript_1630AD:: @ 81630AD
SeafoamIslands_B4F_EventScript_ShowArticuno:: @ 81630AD
clearflag FLAG_HIDE_ARTICUNO
return
SeafoamIslands_B4F_OnLoad:: @ 81630B1
setvar VAR_TEMP_2, 0
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, EventScript_163169
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, EventScript_163169
compare VAR_TEMP_2, 2
goto_if_eq EventScript_1630D4
setvar NUM_BOULDERS_PRESENT, 0
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, SeafoamIslands_B4F_EventScript_AddBoulderPresent
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, SeafoamIslands_B4F_EventScript_AddBoulderPresent
compare NUM_BOULDERS_PRESENT, 2
goto_if_eq SeafoamIslands_B4F_EventScript_SetCalmWaterNearStairs
end
EventScript_1630D4:: @ 81630D4
setmetatile 12, 14, 299, 0
setmetatile 13, 14, 299, 0
SeafoamIslands_B4F_EventScript_SetCalmWaterNearStairs:: @ 81630D4
setmetatile 12, 14, METATILE_General_CalmWater, 0
setmetatile 13, 14, METATILE_General_CalmWater, 0
end
SeafoamIslands_B4F_OnWarp:: @ 81630E7
map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_1630F1
map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, SeafoamIslands_B4F_EventScript_WarpInOnCurrent
.2byte 0
EventScript_1630F1:: @ 81630F1
SeafoamIslands_B4F_EventScript_WarpInOnCurrent:: @ 81630F1
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
special Special_ForcePlayerToStartSurfing
end
SeafoamIslands_B4F_OnFrame:: @ 81630F9
map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_16310B
map_script_2 VAR_TEMP_1, 1, EventScript_163121
map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, SeafoamIslands_B4F_EventScript_EnterOnCurrent
map_script_2 VAR_TEMP_1, 1, SeafoamIslands_B4F_EventScript_EnterByFalling
.2byte 0
EventScript_16310B:: @ 816310B
@ The current the player is forced in on from B3F
SeafoamIslands_B4F_EventScript_EnterOnCurrent:: @ 816310B
lockall
applymovement OBJ_EVENT_ID_PLAYER, Movement_16311D
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_EnterOnCurrent
waitmovement 0
setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 0
releaseall
end
Movement_16311D:: @ 816311D
SeafoamIslands_B4F_Movement_EnterOnCurrent:: @ 816311D
walk_fast_up
walk_fast_up
walk_fast_up
step_end
EventScript_163121:: @ 8163121
@ The current the player lands on when entering the map by falling
SeafoamIslands_B4F_EventScript_EnterByFalling:: @ 8163121
lockall
setvar VAR_TEMP_2, 0
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, EventScript_163169
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, EventScript_163169
compare VAR_TEMP_2, 2
goto_if_eq EventScript_163185
setvar NUM_BOULDERS_PRESENT, 0
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, SeafoamIslands_B4F_EventScript_AddBoulderPresent
call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, SeafoamIslands_B4F_EventScript_AddBoulderPresent
compare NUM_BOULDERS_PRESENT, 2
goto_if_eq SeafoamIslands_B4F_EventScript_CurrentBlocked
getplayerxy VAR_0x8008, VAR_0x8009
compare VAR_0x8008, 9
call_if_lt EventScript_16316F
call_if_lt SeafoamIslands_B4F_EventScript_RideCurrentFar
compare VAR_0x8008, 9
call_if_ge EventScript_16317A
call_if_ge SeafoamIslands_B4F_EventScript_RideCurrentClose
special sub_805D1A8
setvar VAR_TEMP_1, 0
releaseall
end
EventScript_163169:: @ 8163169
addvar VAR_TEMP_2, 1
SeafoamIslands_B4F_EventScript_AddBoulderPresent:: @ 8163169
addvar NUM_BOULDERS_PRESENT, 1
return
EventScript_16316F:: @ 816316F
applymovement OBJ_EVENT_ID_PLAYER, Movement_16318C
SeafoamIslands_B4F_EventScript_RideCurrentFar:: @ 816316F
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_RideCurrentFar
waitmovement 0
return
EventScript_16317A:: @ 816317A
applymovement OBJ_EVENT_ID_PLAYER, Movement_163195
SeafoamIslands_B4F_EventScript_RideCurrentClose:: @ 816317A
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_RideCurrentClose
waitmovement 0
return
EventScript_163185:: @ 8163185
SeafoamIslands_B4F_EventScript_CurrentBlocked:: @ 8163185
setvar VAR_TEMP_1, 0
releaseall
end
Movement_16318C:: @ 816318C
SeafoamIslands_B4F_Movement_RideCurrentFar:: @ 816318C
walk_up
walk_up
walk_up
@@ -131,7 +135,7 @@ Movement_16318C:: @ 816318C
walk_up
step_end
Movement_163195:: @ 8163195
SeafoamIslands_B4F_Movement_RideCurrentClose:: @ 8163195
walk_up
walk_up
walk_up
@@ -141,18 +145,19 @@ Movement_163195:: @ 8163195
walk_up
step_end
SeafoamIslands_B4F_EventScript_16319D:: @ 816319D
@ Triggers blocking re-entry to B3F
SeafoamIslands_B4F_EventScript_UpwardCurrent:: @ 816319D
lockall
applymovement OBJ_EVENT_ID_PLAYER, Movement_1631AA
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_WalkUp
waitmovement 0
releaseall
end
Movement_1631AA:: @ 81631AA
SeafoamIslands_B4F_Movement_WalkUp:: @ 81631AA
walk_up
step_end
SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
@@ -160,7 +165,7 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
setwildbattle SPECIES_ARTICUNO, 50, ITEM_NONE
waitse
playmoncry SPECIES_ARTICUNO, 2
message Text_1A6448
message Text_Gyaoo
waitmessage
waitmoncry
delay 10
@@ -172,33 +177,29 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_16320F
goto_if_eq SeafoamIslands_B4F_EventScript_DefeatedArticuno
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_163218
goto_if_eq SeafoamIslands_B4F_EventScript_RanFromArticuno
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_163218
goto_if_eq SeafoamIslands_B4F_EventScript_RanFromArticuno
setflag FLAG_FOUGHT_ARTICUNO
release
end
EventScript_16320F:: @ 816320F
SeafoamIslands_B4F_EventScript_DefeatedArticuno:: @ 816320F
setflag FLAG_FOUGHT_ARTICUNO
goto EventScript_RemoveStaticMon
EventScript_163217:: @ 8163217
end
EventScript_163218:: @ 8163218
SeafoamIslands_B4F_EventScript_RanFromArticuno:: @ 8163218
setvar VAR_0x8004, SPECIES_ARTICUNO
goto EventScript_MonFlewAway
EventScript_163222:: @ 8163222
end
SeafoamIslands_B4F_EventScript_163223:: @ 8163223
msgbox gUnknown_8179B36, MSGBOX_SIGN
SeafoamIslands_B4F_EventScript_BoulderHintSign:: @ 8163223
msgbox SeafoamIslands_B4F_Text_BouldersMightChangeWaterFlow, MSGBOX_SIGN
end
SeafoamIslands_B4F_EventScript_16322C:: @ 816322C
msgbox gUnknown_8179B65, MSGBOX_SIGN
SeafoamIslands_B4F_EventScript_FastCurrentSign:: @ 816322C
msgbox SeafoamIslands_B4F_Text_DangerFastCurrent, MSGBOX_SIGN
end
data/maps/SeafoamIslands_B4F/text.inc
+2 -2
View File
@@ -19,11 +19,11 @@ Text_RockSlideTaught:: @ 8179B0A
.string "It might be scary to use it in this\n"
.string "tunnel…$"
gUnknown_8179B36:: @ 8179B36
SeafoamIslands_B4F_Text_BouldersMightChangeWaterFlow:: @ 8179B36
.string "Hint: Boulders might change the\n"
.string "flow of water.$"
gUnknown_8179B65:: @ 8179B65
SeafoamIslands_B4F_Text_DangerFastCurrent:: @ 8179B65
.string "DANGER\n"
.string "Fast current!$"
data/maps/SixIsland_DottedHole_1F/scripts.inc
+4 -4
View File
@@ -8,28 +8,28 @@ SixIsland_DottedHole_1F_OnTransition:: @ 8164188
SixIsland_DottedHole_B1F_EventScript_16418C:: @ 816418C
lockall
braillemessage gUnknown_81A9288
braillemessage Braille_Text_Up
waitbuttonpress
releaseall
end
SixIsland_DottedHole_B4F_EventScript_164195:: @ 8164195
lockall
braillemessage gUnknown_81A928B
braillemessage Braille_Text_Down
waitbuttonpress
releaseall
end
SixIsland_DottedHole_B3F_EventScript_16419E:: @ 816419E
lockall
braillemessage gUnknown_81A9290
braillemessage Braille_Text_Right
waitbuttonpress
releaseall
end
SixIsland_DottedHole_B2F_EventScript_1641A7:: @ 81641A7
lockall
braillemessage gUnknown_81A9296
braillemessage Braille_Text_Left
waitbuttonpress
releaseall
end
data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
+16 -61
View File
@@ -238,67 +238,22 @@ Movement_16441C:: @ 816441C
SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F
lockall
setvar VAR_0x8005, 130
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9321
getbraillestringwidth gUnknown_81A9321
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A932D
getbraillestringwidth gUnknown_81A932D
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9338
getbraillestringwidth gUnknown_81A9338
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A933F
getbraillestringwidth gUnknown_81A933F
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A934A
getbraillestringwidth gUnknown_81A934A
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9356
getbraillestringwidth gUnknown_81A9356
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9362
getbraillestringwidth gUnknown_81A9362
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9368
getbraillestringwidth gUnknown_81A9368
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9374
getbraillestringwidth gUnknown_81A9374
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A937C
getbraillestringwidth gUnknown_81A937C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9387
getbraillestringwidth gUnknown_81A9387
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9393
getbraillestringwidth gUnknown_81A9393
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A939F
getbraillestringwidth gUnknown_81A939F
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A93AB
getbraillestringwidth gUnknown_81A93AB
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A93B4
getbraillestringwidth gUnknown_81A93B4
call EventScript_BrailleCursorWaitButton
braillemessage gUnknown_81A93C0
braillemessage_wait Braille_Text_LetTheTwo
braillemessage_wait Braille_Text_Glittering
braillemessage_wait Braille_Text_Stones
braillemessage_wait Braille_Text_OneInRed
braillemessage_wait Braille_Text_OneInBlue
braillemessage_wait Braille_Text_ConnectThe
braillemessage_wait Braille_Text_Past
braillemessage_wait Braille_Text_TwoFriends
braillemessage_wait Braille_Text_Sharing
braillemessage_wait Braille_Text_PowerOpen
braillemessage_wait Braille_Text_AWindowTo
braillemessage_wait Braille_Text_ANewWorld
braillemessage_wait Braille_Text_ThatGlows
braillemessage_wait Braille_Text_TheNext
braillemessage_wait Braille_Text_WorldWaits
braillemessage Braille_Text_ForYou
waitbuttonpress
releaseall
end
data/maps/SixIsland_RuinValley/scripts.inc
+1 -1
View File
@@ -28,7 +28,7 @@ SixIsland_RuinValley_EventScript_168B94:: @ 8168B94
compare VAR_RESULT, NO
goto_if_eq EventScript_168BCB
msgbox gUnknown_818BE11
braillemessage gUnknown_81A929B
braillemessage Braille_Text_Cut
waitbuttonpress
releaseall
end
data/text/braille.inc
+39 -39
View File
@@ -1,116 +1,116 @@
gUnknown_81A9288:: @ 81A9288
Braille_Text_Up:: @ 81A9288
.braille "UP$"
gUnknown_81A928B:: @ 81A928B
Braille_Text_Down:: @ 81A928B
.braille "DOWN$"
gUnknown_81A9290:: @ 81A9290
Braille_Text_Right:: @ 81A9290
.braille "RIGHT$"
gUnknown_81A9296:: @ 81A9296
Braille_Text_Left:: @ 81A9296
.braille "LEFT$"
gUnknown_81A929B:: @ 81A929B
Braille_Text_Cut:: @ 81A929B
.braille "CUT$"
gUnknown_81A929F:: @ 81A929F
Braille_Text_ABC:: @ 81A929F
.braille "ABC$"
gUnknown_81A92A3:: @ 81A92A3
Braille_Text_GHI:: @ 81A92A3
.braille "GHI$"
gUnknown_81A92A7:: @ 81A92A7
Braille_Text_MNO:: @ 81A92A7
.braille "MNO$"
gUnknown_81A92AB:: @ 81A92AB
Braille_Text_TUV:: @ 81A92AB
.braille "TUV$"
gUnknown_81A92AF:: @ 81A92AF
Braille_Text_DEF:: @ 81A92AF
.braille "DEF$"
gUnknown_81A92B3:: @ 81A92B3
Braille_Text_JKL:: @ 81A92B3
.braille "JKL$"
gUnknown_81A92B7:: @ 81A92B7
Braille_Text_PQRS:: @ 81A92B7
.braille "PQRS$"
gUnknown_81A92BC:: @ 81A92BC
Braille_Text_WXYZ:: @ 81A92BC
.braille "WXYZ$"
gUnknown_81A92C1:: @ 81A92C1
Braille_Text_Period:: @ 81A92C1
.braille ".$"
gUnknown_81A92C3:: @ 81A92C3
Braille_Text_Comma:: @ 81A92C3
.braille ",$"
gUnknown_81A92C5:: @ 81A92C5
Braille_Text_Everything:: @ 81A92C5
.braille "EVERYTHING$"
gUnknown_81A92D0:: @ 81A92D0
Braille_Text_HasMeaning1:: @ 81A92D0
.braille "HAS MEANING$"
gUnknown_81A92DC:: @ 81A92DC
Braille_Text_Existence:: @ 81A92DC
.braille "EXISTENCE$"
gUnknown_81A92E6:: @ 81A92E6
Braille_Text_HasMeaning2:: @ 81A92E6
.braille "HAS MEANING$"
gUnknown_81A92F2:: @ 81A92F2
Braille_Text_BeingAlive:: @ 81A92F2
.braille "BEING ALIVE$"
gUnknown_81A92FE:: @ 81A92FE
Braille_Text_HasMeaning3:: @ 81A92FE
.braille "HAS MEANING$"
gUnknown_81A930A:: @ 81A930A
Braille_Text_HaveDreams:: @ 81A930A
.braille "HAVE DREAMS$"
gUnknown_81A9316:: @ 81A9316
Braille_Text_UsePower:: @ 81A9316
.braille "USE POWER.$"
gUnknown_81A9321:: @ 81A9321
Braille_Text_LetTheTwo:: @ 81A9321
.braille "LET THE TWO$"
gUnknown_81A932D:: @ 81A932D
Braille_Text_Glittering:: @ 81A932D
.braille "GLITTERING$"
gUnknown_81A9338:: @ 81A9338
Braille_Text_Stones:: @ 81A9338
.braille "STONES$"
gUnknown_81A933F:: @ 81A933F
Braille_Text_OneInRed:: @ 81A933F
.braille "ONE IN RED$"
gUnknown_81A934A:: @ 81A934A
Braille_Text_OneInBlue:: @ 81A934A
.braille "ONE IN BLUE$"
gUnknown_81A9356:: @ 81A9356
Braille_Text_ConnectThe:: @ 81A9356
.braille "CONNECT THE$"
gUnknown_81A9362:: @ 81A9362
Braille_Text_Past:: @ 81A9362
.braille "PAST.$"
gUnknown_81A9368:: @ 81A9368
Braille_Text_TwoFriends:: @ 81A9368
.braille "TWO FRIENDS$"
gUnknown_81A9374:: @ 81A9374
Braille_Text_Sharing:: @ 81A9374
.braille "SHARING$"
gUnknown_81A937C:: @ 81A937C
Braille_Text_PowerOpen:: @ 81A937C
.braille "POWER OPEN$"
gUnknown_81A9387:: @ 81A9387
Braille_Text_AWindowTo:: @ 81A9387
.braille "A WINDOW TO$"
gUnknown_81A9393:: @ 81A9393
Braille_Text_ANewWorld:: @ 81A9393
.braille "A NEW WORLD$"
gUnknown_81A939F:: @ 81A939F
Braille_Text_ThatGlows:: @ 81A939F
.braille "THAT GLOWS.$"
gUnknown_81A93AB:: @ 81A93AB
Braille_Text_TheNext:: @ 81A93AB
.braille "THE NEXT$"
gUnknown_81A93B4:: @ 81A93B4
Braille_Text_WorldWaits:: @ 81A93B4
.braille "WORLD WAITS$"
gUnknown_81A93C0:: @ 81A93C0
Braille_Text_ForYou:: @ 81A93C0
.braille "FOR YOU.$"
include/constants/layouts.h
+2 -2
View File
@@ -260,8 +260,8 @@
#define LAYOUT_ROUTE5_POKEMON_DAY_CARE 275
#define LAYOUT_VIRIDIAN_CITY_HOUSE1 276
#define LAYOUT_FOUR_ISLAND_POKEMON_DAY_CARE 277
#define LAYOUT_UNUSED_LAYOUT_833B6EC 278
#define LAYOUT_UNUSED_LAYOUT_833BE30 279
#define LAYOUT_SEAFOAM_ISLANDS_B3F_CURRENT_STOPPED 278
#define LAYOUT_SEAFOAM_ISLANDS_B4F_CURRENT_STOPPED 279
#define LAYOUT_MT_EMBER_EXTERIOR 280
#define LAYOUT_MT_EMBER_SUMMIT 281
#define LAYOUT_MT_EMBER_SUMMIT_PATH_1F 282
include/constants/metatile_labels.h
+6
View File
@@ -1,6 +1,9 @@
#ifndef GUARD_METATILE_LABELS_H
#define GUARD_METATILE_LABELS_H
// General
#define METATILE_General_CalmWater 0x12B
// Pokemon Mansion
#define METATILE_PokemonMansion_Floor 0x284
#define METATILE_PokemonMansion_Floor_ShadeFull 0x285
@@ -34,4 +37,7 @@
#define METATILE_PokemonMansion_Statue_RedEyes_Shade 0x34E
#define METATILE_PokemonMansion_Statue_RedEyes_Basement 0x34F
// gTileset_82D504C. Below metatile probably needs generic name
#define METATILE_MtEmber_CaveEntrance 0x346
#endif // GUARD_METATILE_LABELS_H