dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Document Petalburg, Fortree, Sootopolis, and some of Mossdeep Gyms

Browse Source
This commit is contained in:
GriffinR
2019-10-15 04:58:52 -04:00
parent c0b0602516
commit 1b41b8b7ca
37 changed files with 1013 additions and 989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
data/event_scripts.s
View File

@@ -11,6 +11,7 @@
#include "constants/event_object_movement_constants.h"
#include "constants/field_effects.h"
#include "constants/field_specials.h"
#include "constants/field_tasks.h"
#include "constants/flags.h"
#include "constants/game_stat.h"
#include "constants/item.h"
@@ -1246,12 +1247,12 @@ EventScript_RegionMap:: @ 827208F
end
Common_EventScript_PlayBrineysBoatMusic:: @ 82720A0
setflag FLAG_SPECIAL_FLAG_0x4001
setflag FLAG_DONT_TRANSITION_MUSIC
playbgm MUS_M_BOAT, 0
return
Common_EventScript_StopBrineysBoatMusic:: @ 82720A8
clearflag FLAG_SPECIAL_FLAG_0x4001
clearflag FLAG_DONT_TRANSITION_MUSIC
fadedefaultbgm
return
@@ -1273,7 +1274,7 @@ Movement_FerryDepart: @ 82721F0
walk_right
step_end
PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8
EventScript_HideMrBriney:: @ 82721F8
setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
setflag FLAG_HIDE_ROUTE_108_MR_BRINEY

2
data/maps/FortreeCity/scripts.inc
View File

@@ -8,7 +8,7 @@ FortreeCity_OnTransition: @ 81E25AF
end
FortreeCity_MapScript1_1E25B3: @ 81E25B3
setstepcallback 2
setstepcallback STEP_CB_FORTREE_BRIDGE
end
FortreeCity_EventScript_1E25B6:: @ 81E25B6

20
data/maps/FortreeCity_Gym/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FortreeCity_Gym_EventScript_2165C8",
"script": "FortreeCity_Gym_EventScript_Winona",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "FortreeCity_Gym_EventScript_2166A8",
"script": "FortreeCity_Gym_EventScript_Jared",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
"script": "FortreeCity_Gym_EventScript_2166D6",
"script": "FortreeCity_Gym_EventScript_Flint",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
"script": "FortreeCity_Gym_EventScript_2166ED",
"script": "FortreeCity_Gym_EventScript_Ashley",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
"script": "FortreeCity_Gym_EventScript_2166BF",
"script": "FortreeCity_Gym_EventScript_Edwardo",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FortreeCity_Gym_EventScript_216732",
"script": "FortreeCity_Gym_EventScript_GymGuide",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
"script": "FortreeCity_Gym_EventScript_216704",
"script": "FortreeCity_Gym_EventScript_Humberto",
"flag": "0"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "FortreeCity_Gym_EventScript_21671B",
"script": "FortreeCity_Gym_EventScript_Darius",
"flag": "0"
}
],
@@ -143,7 +143,7 @@
"y": 21,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "FortreeCity_Gym_EventScript_216751"
"script": "FortreeCity_Gym_EventScript_LeftGymStatue"
},
{
"type": "sign",
@@ -151,7 +151,7 @@
"y": 21,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "FortreeCity_Gym_EventScript_216761"
"script": "FortreeCity_Gym_EventScript_RightGymStatue"
}
]
}

176
data/maps/FortreeCity_Gym/scripts.inc
View File

@@ -1,44 +1,44 @@
FortreeCity_Gym_MapScripts:: @ 82165AB
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_MapScript2_2165BA
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_OnWarp
.byte 0
FortreeCity_Gym_OnTransition: @ 82165B6
special RotatingGate_InitPuzzle
end
FortreeCity_Gym_MapScript2_2165BA: @ 82165BA
map_script_2 VAR_TEMP_0, 16384, FortreeCity_Gym_EventScript_2165C4
FortreeCity_Gym_OnWarp: @ 82165BA
map_script_2 VAR_TEMP_0, VAR_TEMP_0, FortreeCity_Gym_EventScript_InitRotatingGates
.2byte 0
FortreeCity_Gym_EventScript_2165C4:: @ 82165C4
FortreeCity_Gym_EventScript_InitRotatingGates:: @ 82165C4
special RotatingGate_InitPuzzleAndGraphics
end
FortreeCity_Gym_EventScript_2165C8:: @ 82165C8
trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD, NO_MUSIC
FortreeCity_Gym_EventScript_Winona:: @ 82165C8
trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_WinonaPreBattle, FortreeCity_Gym_Text_WinonaDefeat, FortreeCity_Gym_EventScript_WinonaDefeated, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq FortreeCity_Gym_EventScript_21668D
goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_216646
msgbox FortreeCity_Gym_Text_217071, MSGBOX_DEFAULT
compare VAR_RESULT, TRUE
goto_if_eq FortreeCity_Gym_EventScript_WinonaRematch
goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_GiveAerialAce2
msgbox FortreeCity_Gym_Text_WinonaPostBattle, MSGBOX_DEFAULT
release
end
FortreeCity_Gym_EventScript_2165FD:: @ 82165FD
message FortreeCity_Gym_Text_216EEC
FortreeCity_Gym_EventScript_WinonaDefeated:: @ 82165FD
message FortreeCity_Gym_Text_ReceivedFeatherBadge
waitmessage
call Common_EventScript_PlayGymBadgeFanfare
msgbox FortreeCity_Gym_Text_216F17, MSGBOX_DEFAULT
msgbox FortreeCity_Gym_Text_ExplainFeatherBadgeTakeThis, MSGBOX_DEFAULT
setflag FLAG_DEFEATED_FORTREE_GYM
setflag FLAG_BADGE06_GET
setvar VAR_0x8008, 6
call Common_EventScript_SetGymTrainers
call FortreeCity_Gym_EventScript_21666A
call FortreeCity_Gym_EventScript_GiveAerialAce
closemessage
delay 30
playfanfare MUS_ME_TORE_EYE
msgbox FortreeCity_Gym_Text_217044, MSGBOX_DEFAULT
msgbox FortreeCity_Gym_Text_RegisteredWinona, MSGBOX_DEFAULT
waitfanfare
closemessage
delay 30
@@ -48,94 +48,94 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD
release
end
FortreeCity_Gym_EventScript_216646:: @ 8216646
FortreeCity_Gym_EventScript_GiveAerialAce2:: @ 8216646
giveitem_std ITEM_TM40
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT
msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_TM40
release
end
FortreeCity_Gym_EventScript_21666A:: @ 821666A
FortreeCity_Gym_EventScript_GiveAerialAce:: @ 821666A
giveitem_std ITEM_TM40
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_BagIsFull
msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT
msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_TM40
return
FortreeCity_Gym_EventScript_21668D:: @ 821668D
trainerbattle_rematch_double TRAINER_WINONA_1, FortreeCity_Gym_Text_217100, FortreeCity_Gym_Text_2171E6, FortreeCity_Gym_Text_217292
msgbox FortreeCity_Gym_Text_21720B, MSGBOX_AUTOCLOSE
FortreeCity_Gym_EventScript_WinonaRematch:: @ 821668D
trainerbattle_rematch_double TRAINER_WINONA_1, FortreeCity_Gym_Text_WinonaPreRematch, FortreeCity_Gym_Text_WinonaRematchDefeat, FortreeCity_Gym_Text_WinonaRematchNeedTwoMons
msgbox FortreeCity_Gym_Text_WinonaPostRematch, MSGBOX_AUTOCLOSE
end
FortreeCity_Gym_EventScript_2166A8:: @ 82166A8
trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3
msgbox FortreeCity_Gym_Text_2168E7, MSGBOX_AUTOCLOSE
FortreeCity_Gym_EventScript_Jared:: @ 82166A8
trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_JaredPreBattle, FortreeCity_Gym_Text_JaredDefeat
msgbox FortreeCity_Gym_Text_JaredPostBattle, MSGBOX_AUTOCLOSE
end
FortreeCity_Gym_EventScript_2166BF:: @ 82166BF
trainerbattle_single TRAINER_EDWARDO, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7
msgbox FortreeCity_Gym_Text_2169F1, MSGBOX_AUTOCLOSE
FortreeCity_Gym_EventScript_Edwardo:: @ 82166BF
trainerbattle_single TRAINER_EDWARDO, FortreeCity_Gym_Text_EdwardoPreBattle, FortreeCity_Gym_Text_EdwardoDefeat
msgbox FortreeCity_Gym_Text_EdwardoPostBattle, MSGBOX_AUTOCLOSE
end
FortreeCity_Gym_EventScript_2166D6:: @ 82166D6
trainerbattle_single TRAINER_FLINT, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4
msgbox FortreeCity_Gym_Text_216AD7, MSGBOX_AUTOCLOSE
FortreeCity_Gym_EventScript_Flint:: @ 82166D6
trainerbattle_single TRAINER_FLINT, FortreeCity_Gym_Text_FlintPreBattle, FortreeCity_Gym_Text_FlintDefeat
msgbox FortreeCity_Gym_Text_FlintPostBattle, MSGBOX_AUTOCLOSE
end
FortreeCity_Gym_EventScript_2166ED:: @ 82166ED
trainerbattle_single TRAINER_ASHLEY, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51
msgbox FortreeCity_Gym_Text_216B5F, MSGBOX_AUTOCLOSE
FortreeCity_Gym_EventScript_Ashley:: @ 82166ED
trainerbattle_single TRAINER_ASHLEY, FortreeCity_Gym_Text_AshleyPreBattle, FortreeCity_Gym_Text_AshleyDefeat
msgbox FortreeCity_Gym_Text_AshleyPostBattle, MSGBOX_AUTOCLOSE
end
FortreeCity_Gym_EventScript_216704:: @ 8216704
trainerbattle_single TRAINER_HUMBERTO, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18
msgbox FortreeCity_Gym_Text_216C32, MSGBOX_AUTOCLOSE
FortreeCity_Gym_EventScript_Humberto:: @ 8216704
trainerbattle_single TRAINER_HUMBERTO, FortreeCity_Gym_Text_HumbertoPreBattle, FortreeCity_Gym_Text_HumbertoDefeat
msgbox FortreeCity_Gym_Text_HumbertoPostBattle, MSGBOX_AUTOCLOSE
end
FortreeCity_Gym_EventScript_21671B:: @ 821671B
trainerbattle_single TRAINER_DARIUS, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2
msgbox FortreeCity_Gym_Text_216D0F, MSGBOX_AUTOCLOSE
FortreeCity_Gym_EventScript_Darius:: @ 821671B
trainerbattle_single TRAINER_DARIUS, FortreeCity_Gym_Text_DariusPreBattle, FortreeCity_Gym_Text_DariusDefeat
msgbox FortreeCity_Gym_Text_DariusPostBattle, MSGBOX_AUTOCLOSE
end
FortreeCity_Gym_EventScript_216732:: @ 8216732
FortreeCity_Gym_EventScript_GymGuide:: @ 8216732
lock
faceplayer
goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_216747
msgbox FortreeCity_Gym_Text_216785, MSGBOX_DEFAULT
goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_GymGuidePostVictory
msgbox FortreeCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT
release
end
FortreeCity_Gym_EventScript_216747:: @ 8216747
msgbox FortreeCity_Gym_Text_21687D, MSGBOX_DEFAULT
FortreeCity_Gym_EventScript_GymGuidePostVictory:: @ 8216747
msgbox FortreeCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT
release
end
FortreeCity_Gym_EventScript_216751:: @ 8216751
FortreeCity_Gym_EventScript_LeftGymStatue:: @ 8216751
lockall
goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_216771
goto FortreeCity_Gym_EventScript_21677B
goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_GymStatueCertified
goto FortreeCity_Gym_EventScript_GymStatue
end
FortreeCity_Gym_EventScript_216761:: @ 8216761
FortreeCity_Gym_EventScript_RightGymStatue:: @ 8216761
lockall
goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_216771
goto FortreeCity_Gym_EventScript_21677B
goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_GymStatueCertified
goto FortreeCity_Gym_EventScript_GymStatue
end
FortreeCity_Gym_EventScript_216771:: @ 8216771
msgbox FortreeCity_Gym_Text_2170C7, MSGBOX_DEFAULT
FortreeCity_Gym_EventScript_GymStatueCertified:: @ 8216771
msgbox FortreeCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT
releaseall
end
FortreeCity_Gym_EventScript_21677B:: @ 821677B
msgbox FortreeCity_Gym_Text_2170AE, MSGBOX_DEFAULT
FortreeCity_Gym_EventScript_GymStatue:: @ 821677B
msgbox FortreeCity_Gym_Text_GymStatue, MSGBOX_DEFAULT
releaseall
end
FortreeCity_Gym_Text_216785: @ 8216785
FortreeCity_Gym_Text_GymGuideAdvice: @ 8216785
.string "Yo, how's it going, CHAMPION-\n"
.string "bound {PLAYER}?\p"
.string "FORTREE GYM LEADER WINONA is\n"
@@ -146,94 +146,94 @@ FortreeCity_Gym_Text_216785: @ 8216785
.string "who are trying to take wing!\p"
.string "Okay, go for it!$"
FortreeCity_Gym_Text_21687D: @ 821687D
FortreeCity_Gym_Text_GymGuidePostVictory: @ 821687D
.string "You did it!\n"
.string "You've achieved liftoff!$"
FortreeCity_Gym_Text_2168A2: @ 82168A2
FortreeCity_Gym_Text_JaredPreBattle: @ 82168A2
.string "Behold the elegant battle style of\n"
.string "BIRD POKéMON!$"
FortreeCity_Gym_Text_2168D3: @ 82168D3
FortreeCity_Gym_Text_JaredDefeat: @ 82168D3
.string "You…\n"
.string "You're strong…$"
FortreeCity_Gym_Text_2168E7: @ 82168E7
FortreeCity_Gym_Text_JaredPostBattle: @ 82168E7
.string "A TRAINER has to be smart to keep\n"
.string "up with unexpected turns of events.\p"
.string "Do you have the smarts to get to\n"
.string "our LEADER?$"
FortreeCity_Gym_Text_21695A: @ 821695A
FortreeCity_Gym_Text_EdwardoPreBattle: @ 821695A
.string "The lovers of BIRD POKéMON aspire\n"
.string "to join this GYM.\p"
.string "As a member of the FORTREE GYM,\n"
.string "I'm not allowed to lose!$"
FortreeCity_Gym_Text_2169C7: @ 82169C7
FortreeCity_Gym_Text_EdwardoDefeat: @ 82169C7
.string "It was too much of a load for me\n"
.string "to bear…$"
FortreeCity_Gym_Text_2169F1: @ 82169F1
FortreeCity_Gym_Text_EdwardoPostBattle: @ 82169F1
.string "The world is huge, and there are\n"
.string "countless tough TRAINERS.\p"
.string "I'm going to keep training and make\n"
.string "myself even stronger.$"
FortreeCity_Gym_Text_216A66: @ 8216A66
FortreeCity_Gym_Text_FlintPreBattle: @ 8216A66
.string "There's no need for WINONA, our GYM\n"
.string "LEADER, to deal with you!\p"
.string "I'm plenty good enough for you!$"
FortreeCity_Gym_Text_216AC4: @ 8216AC4
FortreeCity_Gym_Text_FlintDefeat: @ 8216AC4
.string "WINONA, I…\n"
.string "I lost!$"
FortreeCity_Gym_Text_216AD7: @ 8216AD7
FortreeCity_Gym_Text_FlintPostBattle: @ 8216AD7
.string "WINONA is cute and she's strong.\n"
.string "She's the ultimate LEADER!\p"
.string "Blush…$"
FortreeCity_Gym_Text_216B1A: @ 8216B1A
FortreeCity_Gym_Text_AshleyPreBattle: @ 8216B1A
.string "WINONA taught me personally!\n"
.string "You can't beat me easily!$"
FortreeCity_Gym_Text_216B51: @ 8216B51
FortreeCity_Gym_Text_AshleyDefeat: @ 8216B51
.string "I was beaten…$"
FortreeCity_Gym_Text_216B5F: @ 8216B5F
FortreeCity_Gym_Text_AshleyPostBattle: @ 8216B5F
.string "Thanks to WINONA, the people of\n"
.string "FORTREE can live without fear.$"
FortreeCity_Gym_Text_216B9E: @ 8216B9E
FortreeCity_Gym_Text_HumbertoPreBattle: @ 8216B9E
.string "When WINONA takes to battle, her face\n"
.string "shines with beautiful determination…\p"
.string "I'm not letting you witness that\n"
.string "lovely sight!$"
FortreeCity_Gym_Text_216C18: @ 8216C18
FortreeCity_Gym_Text_HumbertoDefeat: @ 8216C18
.string "Urk!\n"
.string "I couldn't stop you.$"
FortreeCity_Gym_Text_216C32: @ 8216C32
FortreeCity_Gym_Text_HumbertoPostBattle: @ 8216C32
.string "You'd better watch it!\n"
.string "Don't get distracted staring at WINONA\l"
.string "or you'll go crashing down in a heap!$"
FortreeCity_Gym_Text_216C96: @ 8216C96
FortreeCity_Gym_Text_DariusPreBattle: @ 8216C96
.string "You'd better know that there are all\n"
.string "sorts of FLYING-type POKéMON.\p"
.string "You do know that, right?$"
FortreeCity_Gym_Text_216CF2: @ 8216CF2
FortreeCity_Gym_Text_DariusDefeat: @ 8216CF2
.string "You seem to know your stuff!$"
FortreeCity_Gym_Text_216D0F: @ 8216D0F
FortreeCity_Gym_Text_DariusPostBattle: @ 8216D0F
.string "Sure, you beat me all right.\n"
.string "But you'd better watch it! Our LEADER\l"
.string "WINONA's POKéMON are all business.$"
FortreeCity_Gym_Text_216D75: @ 8216D75
FortreeCity_Gym_Text_WinonaPreBattle: @ 8216D75
.string "I am WINONA. I am the LEADER of\n"
.string "the FORTREE POKéMON GYM.\p"
.string "I have become one with BIRD POKéMON\n"
@@ -243,18 +243,18 @@ FortreeCity_Gym_Text_216D75: @ 8216D75
.string "Witness the elegant choreography\n"
.string "of BIRD POKéMON and I!$"
FortreeCity_Gym_Text_216E60: @ 8216E60
FortreeCity_Gym_Text_WinonaDefeat: @ 8216E60
.string "Never before have I seen a TRAINER\n"
.string "command POKéMON with more grace\l"
.string "than I…\p"
.string "In recognition of your prowess,\n"
.string "I present to you this GYM BADGE.$"
FortreeCity_Gym_Text_216EEC: @ 8216EEC
FortreeCity_Gym_Text_ReceivedFeatherBadge: @ 8216EEC
.string "{PLAYER} received the FEATHER BADGE\n"
.string "from WINONA.$"
FortreeCity_Gym_Text_216F17: @ 8216F17
FortreeCity_Gym_Text_ExplainFeatherBadgeTakeThis: @ 8216F17
.string "With the FEATHER BADGE, all POKéMON up\n"
.string "to LV 70, even those received through\l"
.string "trades, will obey your every command.\p"
@@ -263,29 +263,29 @@ FortreeCity_Gym_Text_216F17: @ 8216F17
.string "And this…\n"
.string "This is a gift from me.$"
FortreeCity_Gym_Text_216FEC: @ 8216FEC
FortreeCity_Gym_Text_ExplainAerialAce: @ 8216FEC
.string "TM40 contains AERIAL ACE.\p"
.string "Its speed…\n"
.string "No POKéMON should be able to avoid it.\p"
.string "… … … … … …$"
FortreeCity_Gym_Text_217044: @ 8217044
FortreeCity_Gym_Text_RegisteredWinona: @ 8217044
.string "Registered GYM LEADER WINONA\n"
.string "in the POKéNAV.$"
FortreeCity_Gym_Text_217071: @ 8217071
FortreeCity_Gym_Text_WinonaPostBattle: @ 8217071
.string "Though I fell to you, I will remain\n"
.string "devoted to BIRD POKéMON.$"
FortreeCity_Gym_Text_2170AE: @ 82170AE
FortreeCity_Gym_Text_GymStatue: @ 82170AE
.string "FORTREE CITY POKéMON GYM$"
FortreeCity_Gym_Text_2170C7: @ 82170C7
FortreeCity_Gym_Text_GymStatueCertified: @ 82170C7
.string "FORTREE CITY POKéMON GYM\p"
.string "WINONA'S CERTIFIED TRAINERS:\n"
.string "{PLAYER}$"
FortreeCity_Gym_Text_217100: @ 8217100
FortreeCity_Gym_Text_WinonaPreRematch: @ 8217100
.string "WINONA: We humans can never escape\n"
.string "gravity's pull on the ground.\p"
.string "But by striving for excellence,\n"
@@ -295,17 +295,17 @@ FortreeCity_Gym_Text_217100: @ 8217100
.string "Please, allow me to see your power\n"
.string "at full flight!$"
FortreeCity_Gym_Text_2171E6: @ 82171E6
FortreeCity_Gym_Text_WinonaRematchDefeat: @ 82171E6
.string "I failed to reach your height again…$"
FortreeCity_Gym_Text_21720B: @ 821720B
FortreeCity_Gym_Text_WinonaPostRematch: @ 821720B
.string "WINONA: Even though I have lost,\n"
.string "the wings of my heart remain unbroken.\p"
.string "I can rise and soar again and\n"
.string "yet again.\p"
.string "I am convinced of it!$"
FortreeCity_Gym_Text_217292: @ 8217292
FortreeCity_Gym_Text_WinonaRematchNeedTwoMons: @ 8217292
.string "WINONA: We humans can never escape\n"
.string "gravity's pull on the ground.\p"
.string "But by striving for excellence,\n"

2
data/maps/GraniteCave_B1F/scripts.inc
View File

@@ -5,7 +5,7 @@ GraniteCave_B1F_MapScripts:: @ 822DC5E
.byte 0
GraniteCave_B1F_MapScript1_22DC6E: @ 822DC6E
setstepcallback 7
setstepcallback STEP_CB_CRACKED_FLOOR
setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0
end

2
data/maps/InsideOfTruck/scripts.inc
View File

@@ -10,7 +10,7 @@ InsideOfTruck_MapScript1_23BEE5: @ 823BEE5
end
InsideOfTruck_MapScript1_23BF01: @ 823BF01
setstepcallback 5
setstepcallback STEP_CB_TRUCK
end
InsideOfTruck_EventScript_23BF04:: @ 823BF04

2
data/maps/JaggedPass/scripts.inc
View File

@@ -5,7 +5,7 @@ JaggedPass_MapScripts:: @ 8230656
.byte 0
JaggedPass_MapScript1_230666: @ 8230666
setstepcallback 1
setstepcallback STEP_CB_ASH
compare VAR_JAGGED_PASS_STATE, 0
call_if_eq JaggedPass_EventScript_230674
end

2
data/maps/MirageTower_2F/scripts.inc
View File

@@ -5,7 +5,7 @@ MirageTower_2F_MapScripts:: @ 823AD11
.byte 0
MirageTower_2F_MapScript1_23AD21: @ 823AD21
setstepcallback 7
setstepcallback STEP_CB_CRACKED_FLOOR
setholewarp MAP_MIRAGE_TOWER_1F, 255, 0, 0
end

2
data/maps/MirageTower_3F/scripts.inc
View File

@@ -5,7 +5,7 @@ MirageTower_3F_MapScripts:: @ 823AD2C
.byte 0
MirageTower_3F_MapScript1_23AD3C: @ 823AD3C
setstepcallback 7
setstepcallback STEP_CB_CRACKED_FLOOR
setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0
end

34
data/maps/MossdeepCity_Gym/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_Gym_EventScript_220898",
"script": "MossdeepCity_Gym_EventScript_TateAndLiza",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220AFD",
"script": "MossdeepCity_Gym_EventScript_Preston",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220B2B",
"script": "MossdeepCity_Gym_EventScript_Blake",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220B70",
"script": "MossdeepCity_Gym_EventScript_Maura",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220B59",
"script": "MossdeepCity_Gym_EventScript_Samantha",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220B14",
"script": "MossdeepCity_Gym_EventScript_Virgil",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220B42",
"script": "MossdeepCity_Gym_EventScript_Hannah",
"flag": "0"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_Gym_EventScript_220C11",
"script": "MossdeepCity_Gym_EventScript_GymGuide",
"flag": "0"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_Gym_EventScript_220898",
"script": "MossdeepCity_Gym_EventScript_TateAndLiza",
"flag": "0"
},
{
@@ -232,7 +232,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220B9E",
"script": "MossdeepCity_Gym_EventScript_Nate",
"flag": "0"
},
{
@@ -245,7 +245,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220B87",
"script": "MossdeepCity_Gym_EventScript_Sylvia",
"flag": "0"
},
{
@@ -336,7 +336,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220BCC",
"script": "MossdeepCity_Gym_EventScript_Clifford",
"flag": "0"
},
{
@@ -362,7 +362,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220BB5",
"script": "MossdeepCity_Gym_EventScript_Macey",
"flag": "0"
},
{
@@ -375,7 +375,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220BFA",
"script": "MossdeepCity_Gym_EventScript_Kathleen",
"flag": "0"
},
{
@@ -427,7 +427,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220BE3",
"script": "MossdeepCity_Gym_EventScript_Nicholas",
"flag": "0"
},
{
@@ -673,7 +673,7 @@
"y": 34,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "MossdeepCity_Gym_EventScript_220C33"
"script": "MossdeepCity_Gym_EventScript_LeftGymStatue"
},
{
"type": "sign",
@@ -681,7 +681,7 @@
"y": 34,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "MossdeepCity_Gym_EventScript_220C43"
"script": "MossdeepCity_Gym_EventScript_RightGymStatue"
}
]
}

208
data/maps/MossdeepCity_Gym/scripts.inc
View File

@@ -1,8 +1,8 @@
MossdeepCity_Gym_MapScripts:: @ 8220800
map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_Gym_MapScript1_220806
map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_Gym_OnLoad
.byte 0
MossdeepCity_Gym_MapScript1_220806: @ 8220806
MossdeepCity_Gym_OnLoad: @ 8220806
goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_22083D
goto MossdeepCity_Gym_EventScript_220815
end
@@ -44,21 +44,21 @@ MossdeepCity_Gym_EventScript_220885:: @ 8220885
setmetatile 5, 24, METATILE_MossdeepGym_Empty1, 1
end
MossdeepCity_Gym_EventScript_220898:: @ 8220898
trainerbattle_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1, NO_MUSIC
MossdeepCity_Gym_EventScript_TateAndLiza:: @ 8220898
trainerbattle_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_TateAndLizaPreBattle, MossdeepCity_Gym_Text_TateAndLizaDefeat, MossdeepCity_Gym_Text_TateAndLizaNeedTwoMons, MossdeepCity_Gym_EventScript_TateAndLizaDefeated, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq MossdeepCity_Gym_EventScript_22097E
goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_220937
msgbox MossdeepCity_Gym_Text_221B1D, MSGBOX_DEFAULT
compare VAR_RESULT, TRUE
goto_if_eq MossdeepCity_Gym_EventScript_TateAndLizaRematch
goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_GiveCalmMind2
msgbox MossdeepCity_Gym_Text_TateAndLizaPostBattle, MSGBOX_DEFAULT
release
end
MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
message MossdeepCity_Gym_Text_22196A
MossdeepCity_Gym_EventScript_TateAndLizaDefeated:: @ 82208D1
message MossdeepCity_Gym_Text_ReceivedMindBadge
waitmessage
call Common_EventScript_PlayGymBadgeFanfare
msgbox MossdeepCity_Gym_Text_221999, MSGBOX_DEFAULT
msgbox MossdeepCity_Gym_Text_ExplainMindBadgeTakeThis, MSGBOX_DEFAULT
setflag FLAG_DEFEATED_MOSSDEEP_GYM
setflag FLAG_BADGE07_GET
setflag FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
@@ -74,11 +74,11 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
setvar VAR_MOSSDEEP_CITY_STATE, 1
setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN
setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1
call MossdeepCity_Gym_EventScript_22095B
call MossdeepCity_Gym_EventScript_GiveCalmMind
closemessage
delay 30
playfanfare MUS_ME_TORE_EYE
msgbox MossdeepCity_Gym_Text_221AEA, MSGBOX_DEFAULT
msgbox MossdeepCity_Gym_Text_RegisteredTateAndLiza, MSGBOX_DEFAULT
waitfanfare
closemessage
delay 30
@@ -86,7 +86,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
release
end
MossdeepCity_Gym_EventScript_220937:: @ 8220937
MossdeepCity_Gym_EventScript_GiveCalmMind2:: @ 8220937
giveitem_std ITEM_TM04
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
@@ -95,7 +95,7 @@ MossdeepCity_Gym_EventScript_220937:: @ 8220937
release
end
MossdeepCity_Gym_EventScript_22095B:: @ 822095B
MossdeepCity_Gym_EventScript_GiveCalmMind:: @ 822095B
giveitem_std ITEM_TM04
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_BagIsFull
@@ -103,23 +103,23 @@ MossdeepCity_Gym_EventScript_22095B:: @ 822095B
setflag FLAG_RECEIVED_TM04
return
MossdeepCity_Gym_EventScript_22097E:: @ 822097E
trainerbattle_rematch_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_221D0B, MossdeepCity_Gym_Text_221E05, MossdeepCity_Gym_Text_221EB8
msgbox MossdeepCity_Gym_Text_221E45, MSGBOX_AUTOCLOSE
MossdeepCity_Gym_EventScript_TateAndLizaRematch:: @ 822097E
trainerbattle_rematch_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_TateAndLizaPreRematch, MossdeepCity_Gym_Text_TateAndLizaRematchDefeat, MossdeepCity_Gym_Text_TateAndLizaRematchNeedTwoMons
msgbox MossdeepCity_Gym_Text_TateAndLizaPostRematch, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220999:: @ 8220999
lockall
goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_2209D0
setflag FLAG_MOSSDEEP_GYM_SWITCH_1
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_Delay32
waitmovement 0
setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Top, 0
setmetatile 2, 7, METATILE_MossdeepGym_Empty1, 1
goto MossdeepCity_Gym_EventScript_2209C8
goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end
MossdeepCity_Gym_EventScript_2209C8:: @ 82209C8
MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed:: @ 82209C8
special DrawWholeMapView
playse SE_TK_KASYA
releaseall
@@ -127,71 +127,71 @@ MossdeepCity_Gym_EventScript_2209C8:: @ 82209C8
MossdeepCity_Gym_EventScript_2209D0:: @ 82209D0
clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_Delay32
waitmovement 0
setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Base, 0
setmetatile 2, 7, METATILE_MossdeepGym_Empty0, 1
goto MossdeepCity_Gym_EventScript_2209C8
goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end
MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5
lockall
goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_220A24
setflag FLAG_MOSSDEEP_GYM_SWITCH_2
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_Delay32
waitmovement 0
setmetatile 8, 14, METATILE_MossdeepGym_Obelisk_Top, 0
setmetatile 8, 10, METATILE_MossdeepGym_Empty1, 1
goto MossdeepCity_Gym_EventScript_2209C8
goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end
MossdeepCity_Gym_EventScript_220A24:: @ 8220A24
clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_Delay32
waitmovement 0
setmetatile 8, 14, METATILE_MossdeepGym_OuterWall_RightCorner, 0
setmetatile 8, 10, METATILE_MossdeepGym_Empty0, 1
goto MossdeepCity_Gym_EventScript_2209C8
goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end
MossdeepCity_Gym_EventScript_220A49:: @ 8220A49
lockall
goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_220A78
setflag FLAG_MOSSDEEP_GYM_SWITCH_3
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_Delay32
waitmovement 0
setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Base, 0
setmetatile 17, 15, METATILE_MossdeepGym_Empty1, 1
goto MossdeepCity_Gym_EventScript_2209C8
goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end
MossdeepCity_Gym_EventScript_220A78:: @ 8220A78
clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_Delay32
waitmovement 0
setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Top, 0
setmetatile 17, 15, METATILE_MossdeepGym_Empty0, 1
goto MossdeepCity_Gym_EventScript_2209C8
goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end
MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D
lockall
goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_220ACC
setflag FLAG_MOSSDEEP_GYM_SWITCH_4
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_Delay32
waitmovement 0
setmetatile 1, 23, METATILE_MossdeepGym_Wall_LeftCorner, 0
setmetatile 5, 24, METATILE_MossdeepGym_Empty1, 1
goto MossdeepCity_Gym_EventScript_2209C8
goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end
MossdeepCity_Gym_EventScript_220ACC:: @ 8220ACC
clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_Delay32
waitmovement 0
setmetatile 1, 23, METATILE_MossdeepGym_Obelisk_Top, 0
setmetatile 5, 24, METATILE_MossdeepGym_Empty0, 1
goto MossdeepCity_Gym_EventScript_2209C8
goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end
MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1
@@ -201,71 +201,71 @@ MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1
releaseall
end
MossdeepCity_Gym_EventScript_220AFD:: @ 8220AFD
trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC
msgbox MossdeepCity_Gym_Text_220ED3, MSGBOX_AUTOCLOSE
MossdeepCity_Gym_EventScript_Preston:: @ 8220AFD
trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_PrestonPreBattle, MossdeepCity_Gym_Text_PrestonDefeat
msgbox MossdeepCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B14:: @ 8220B14
trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A
msgbox MossdeepCity_Gym_Text_220F3A, MSGBOX_AUTOCLOSE
MossdeepCity_Gym_EventScript_Virgil:: @ 8220B14
trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_VirgilPreBattle, MossdeepCity_Gym_Text_VirgilDefeat
msgbox MossdeepCity_Gym_Text_VirgilPostBattle, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B2B:: @ 8220B2B
trainerbattle_single TRAINER_BLAKE, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024
msgbox MossdeepCity_Gym_Text_221055, MSGBOX_AUTOCLOSE
MossdeepCity_Gym_EventScript_Blake:: @ 8220B2B
trainerbattle_single TRAINER_BLAKE, MossdeepCity_Gym_Text_BlakePreBattle, MossdeepCity_Gym_Text_BlakeDefeat
msgbox MossdeepCity_Gym_Text_BlakePostBattle, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B42:: @ 8220B42
trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152
msgbox MossdeepCity_Gym_Text_22116A, MSGBOX_AUTOCLOSE
MossdeepCity_Gym_EventScript_Hannah:: @ 8220B42
trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_HannahPreBattle, MossdeepCity_Gym_Text_HannahDefeat
msgbox MossdeepCity_Gym_Text_HannahPostBattle, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B59:: @ 8220B59
trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230
msgbox MossdeepCity_Gym_Text_22123D, MSGBOX_AUTOCLOSE
MossdeepCity_Gym_EventScript_Samantha:: @ 8220B59
trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_SamanthaPreBattle, MossdeepCity_Gym_Text_SamanthaDefeat
msgbox MossdeepCity_Gym_Text_SamanthaPostBattle, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B70:: @ 8220B70
trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309
msgbox MossdeepCity_Gym_Text_22132E, MSGBOX_AUTOCLOSE
MossdeepCity_Gym_EventScript_Maura:: @ 8220B70
trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_MauraPreBattle, MossdeepCity_Gym_Text_MauraDefeat
msgbox MossdeepCity_Gym_Text_MauraPostBattle, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B87:: @ 8220B87
MossdeepCity_Gym_EventScript_Sylvia:: @ 8220B87
trainerbattle_single TRAINER_SYLVIA, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4
msgbox MossdeepCity_Gym_Text_221412, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B9E:: @ 8220B9E
MossdeepCity_Gym_EventScript_Nate:: @ 8220B9E
trainerbattle_single TRAINER_NATE, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7
msgbox MossdeepCity_Gym_Text_2214D3, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220BB5:: @ 8220BB5
MossdeepCity_Gym_EventScript_Macey:: @ 8220BB5
trainerbattle_single TRAINER_MACEY, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658
msgbox MossdeepCity_Gym_Text_221680, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220BCC:: @ 8220BCC
MossdeepCity_Gym_EventScript_Clifford:: @ 8220BCC
trainerbattle_single TRAINER_CLIFFORD, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8
msgbox MossdeepCity_Gym_Text_2215E2, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220BE3:: @ 8220BE3
MossdeepCity_Gym_EventScript_Nicholas:: @ 8220BE3
trainerbattle_single TRAINER_NICHOLAS, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D
msgbox MossdeepCity_Gym_Text_22173A, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA
MossdeepCity_Gym_EventScript_Kathleen:: @ 8220BFA
trainerbattle_single TRAINER_KATHLEEN, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B
msgbox MossdeepCity_Gym_Text_221545, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220C11:: @ 8220C11
MossdeepCity_Gym_EventScript_GymGuide:: @ 8220C11
lock
faceplayer
goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_220C26
msgbox MossdeepCity_Gym_Text_220CD5, MSGBOX_DEFAULT
msgbox MossdeepCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT
release
end
@@ -274,30 +274,30 @@ MossdeepCity_Gym_EventScript_220C26:: @ 8220C26
release
end
MossdeepCity_Gym_Movement_220C30: @ 8220C30
MossdeepCity_Gym_Movement_Delay32: @ 8220C30
delay_16
delay_16
step_end
MossdeepCity_Gym_EventScript_220C33:: @ 8220C33
MossdeepCity_Gym_EventScript_LeftGymStatue:: @ 8220C33
lockall
goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_220C53
goto MossdeepCity_Gym_EventScript_220C5D
goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_GymStatueCertified
goto MossdeepCity_Gym_EventScript_GymStatue
end
MossdeepCity_Gym_EventScript_220C43:: @ 8220C43
MossdeepCity_Gym_EventScript_RightGymStatue:: @ 8220C43
lockall
goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_220C53
goto MossdeepCity_Gym_EventScript_220C5D
goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_GymStatueCertified
goto MossdeepCity_Gym_EventScript_GymStatue
end
MossdeepCity_Gym_EventScript_220C53:: @ 8220C53
msgbox MossdeepCity_Gym_Text_221CCA, MSGBOX_DEFAULT
MossdeepCity_Gym_EventScript_GymStatueCertified:: @ 8220C53
msgbox MossdeepCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT
releaseall
end
MossdeepCity_Gym_EventScript_220C5D:: @ 8220C5D
msgbox MossdeepCity_Gym_Text_221CB0, MSGBOX_DEFAULT
MossdeepCity_Gym_EventScript_GymStatue:: @ 8220C5D
msgbox MossdeepCity_Gym_Text_GymStatue, MSGBOX_DEFAULT
releaseall
end
@@ -361,7 +361,7 @@ MossdeepCity_Gym_EventScript_220CBF:: @ 8220CBF
mossdeepgym4
end
MossdeepCity_Gym_Text_220CD5: @ 8220CD5
MossdeepCity_Gym_Text_GymGuideAdvice: @ 8220CD5
.string "Yo, how's it going, CHAMPION-bound\n"
.string "{PLAYER}?\p"
.string "The GYM LEADERS here use\n"
@@ -379,42 +379,42 @@ MossdeepCity_Gym_Text_220E2A: @ 8220E2A
.string "Wow, you're astounding!\n"
.string "You're one great TRAINER!$"
MossdeepCity_Gym_Text_220E5C: @ 8220E5C
MossdeepCity_Gym_Text_PrestonPreBattle: @ 8220E5C
.string "Battles hinge on the strength of your\n"
.string "spirit! The weak-spirited will never win!$"
MossdeepCity_Gym_Text_220EAC: @ 8220EAC
MossdeepCity_Gym_Text_PrestonDefeat: @ 8220EAC
.string "I lost!\n"
.string "I must temper my spirit again!$"
MossdeepCity_Gym_Text_220ED3: @ 8220ED3
MossdeepCity_Gym_Text_PrestonPostBattle: @ 8220ED3
.string "The indecisive lose.\n"
.string "That's my warning to you.$"
MossdeepCity_Gym_Text_220F02: @ 8220F02
MossdeepCity_Gym_Text_VirgilPreBattle: @ 8220F02
.string "Let me see your talent!$"
MossdeepCity_Gym_Text_220F1A: @ 8220F1A
MossdeepCity_Gym_Text_VirgilDefeat: @ 8220F1A
.string "You possess spectacular talent!$"
MossdeepCity_Gym_Text_220F3A: @ 8220F3A
MossdeepCity_Gym_Text_VirgilPostBattle: @ 8220F3A
.string "If there are prodigies in the world,\n"
.string "then our GYM LEADERS are them!\p"
.string "However, you may be even more talented\n"
.string "than them…$"
MossdeepCity_Gym_Text_220FB0: @ 8220FB0
MossdeepCity_Gym_Text_BlakePreBattle: @ 8220FB0
.string "Fufufufu… Watch me levitate a POKé\n"
.string "BALL telekinetically!\p"
.string "Wrooooooooaaaar!\n"
.string "… … … … … … …\p"
.string "Sometimes, I'm out of sync…$"
MossdeepCity_Gym_Text_221024: @ 8221024
MossdeepCity_Gym_Text_BlakeDefeat: @ 8221024
.string "My POKéMON battling skills are out\n"
.string "of sync, too!$"
MossdeepCity_Gym_Text_221055: @ 8221055
MossdeepCity_Gym_Text_BlakePostBattle: @ 8221055
.string "A POKé BALL was too heavy to lift\n"
.string "psychically. But this dust bunny…\p"
.string "Whoooooooooooooooh!\n"
@@ -422,46 +422,46 @@ MossdeepCity_Gym_Text_221055: @ 8221055
.string "No, I'm not cheating!\n"
.string "I didn't blow on it! Honestly!$"
MossdeepCity_Gym_Text_2210EE: @ 82210EE
MossdeepCity_Gym_Text_HannahPreBattle: @ 82210EE
.string "When you lose to me, don't be too hard\n"
.string "on yourself.\p"
.string "It's not that you're weak--I'm just\n"
.string "too strong!$"
MossdeepCity_Gym_Text_221152: @ 8221152
MossdeepCity_Gym_Text_HannahDefeat: @ 8221152
.string "You're just too strong!$"
MossdeepCity_Gym_Text_22116A: @ 822116A
MossdeepCity_Gym_Text_HannahPostBattle: @ 822116A
.string "I'm not going to get down on myself for\n"
.string "losing. I just need to train harder.\p"
.string "Positive thinking--that's my strong\n"
.string "point!$"
MossdeepCity_Gym_Text_2211E2: @ 82211E2
MossdeepCity_Gym_Text_SamanthaPreBattle: @ 82211E2
.string "I see it…\n"
.string "I see your future…\p"
.string "If you can beat me, I will tell you\n"
.string "your future!$"
MossdeepCity_Gym_Text_221230: @ 8221230
MossdeepCity_Gym_Text_SamanthaDefeat: @ 8221230
.string "I surrender!$"
MossdeepCity_Gym_Text_22123D: @ 822123D
MossdeepCity_Gym_Text_SamanthaPostBattle: @ 822123D
.string "You will wage a terrifically intense\n"
.string "battle with our GYM LEADERS…\p"
.string "The result…\n"
.string "You won't hear it from me!$"
MossdeepCity_Gym_Text_2212A6: @ 82212A6
MossdeepCity_Gym_Text_MauraPreBattle: @ 82212A6
.string "The roads you have traveled…\n"
.string "What you have experienced…\p"
.string "Come at me with everything you've\n"
.string "learned!$"
MossdeepCity_Gym_Text_221309: @ 8221309
MossdeepCity_Gym_Text_MauraDefeat: @ 8221309
.string "You've traveled a path of greatness!$"
MossdeepCity_Gym_Text_22132E: @ 822132E
MossdeepCity_Gym_Text_MauraPostBattle: @ 822132E
.string "A bright future awaits those who have\n"
.string "worked diligently.\p"
.string "For those who lazed idly, there is\n"
@@ -542,7 +542,7 @@ MossdeepCity_Gym_Text_22173A: @ 822173A
.string "All right! I think I'll develop a special\n"
.string "invincible POKéMON power next.$"
MossdeepCity_Gym_Text_221783: @ 8221783
MossdeepCity_Gym_Text_TateAndLizaPreBattle: @ 8221783
.string "TATE: Hehehe… Were you surprised?\p"
.string "LIZA: Fufufu… Were you surprised?\p"
.string "TATE: That there are two GYM LEADERS?\n"
@@ -556,17 +556,17 @@ MossdeepCity_Gym_Text_221783: @ 8221783
.string "TATE: This combination of ours…\n"
.string "LIZA: Can you beat it?$"
MossdeepCity_Gym_Text_2218EC: @ 82218EC
MossdeepCity_Gym_Text_TateAndLizaDefeat: @ 82218EC
.string "TATE: What?! Our combination…\n"
.string "LIZA: Was shattered!\p"
.string "TATE: It can't be helped. You've won…\n"
.string "LIZA: So, in recognition, take this.$"
MossdeepCity_Gym_Text_22196A: @ 822196A
MossdeepCity_Gym_Text_ReceivedMindBadge: @ 822196A
.string "{PLAYER} received the MIND BADGE\n"
.string "from TATE and LIZA.$"
MossdeepCity_Gym_Text_221999: @ 8221999
MossdeepCity_Gym_Text_ExplainMindBadgeTakeThis: @ 8221999
.string "TATE: The MIND BADGE enhances the\n"
.string "SP. ATK and SP. DEF of POKéMON.\p"
.string "LIZA: It also lets you use the HM move\n"
@@ -582,18 +582,18 @@ MossdeepCity_Gym_Text_221A40: @ 8221A40
.string "LIZA: For PSYCHIC POKéMON!\p"
.string "… … … … … …$"
MossdeepCity_Gym_Text_221AEA: @ 8221AEA
MossdeepCity_Gym_Text_RegisteredTateAndLiza: @ 8221AEA
.string "Registered GYM LEADERS TATE & LIZA\n"
.string "in the POKéNAV.$"
MossdeepCity_Gym_Text_221B1D: @ 8221B1D
MossdeepCity_Gym_Text_TateAndLizaPostBattle: @ 8221B1D
.string "TATE: Looks like the bond between you\n"
.string "and your POKéMON is far stronger than\l"
.string "the bond that we share as twins.\p"
.string "LIZA: You will become even stronger!\n"
.string "We've battled you, so we know.$"
MossdeepCity_Gym_Text_221BCE: @ 8221BCE
MossdeepCity_Gym_Text_TateAndLizaNeedTwoMons: @ 8221BCE
.string "TATE: Hehehe… Were you surprised?\p"
.string "LIZA: That there are two GYM LEADERS?\p"
.string "TATE: Oops, you have only one…\n"
@@ -602,15 +602,15 @@ MossdeepCity_Gym_Text_221BCE: @ 8221BCE
.string "LIZA: If you want to challenge us,\n"
.string "bring some more POKéMON.$"
MossdeepCity_Gym_Text_221CB0: @ 8221CB0
MossdeepCity_Gym_Text_GymStatue: @ 8221CB0
.string "MOSSDEEP CITY POKéMON GYM$"
MossdeepCity_Gym_Text_221CCA: @ 8221CCA
MossdeepCity_Gym_Text_GymStatueCertified: @ 8221CCA
.string "MOSSDEEP CITY POKéMON GYM\p"
.string "LIZA AND TATE'S CERTIFIED TRAINERS:\n"
.string "{PLAYER}$"
MossdeepCity_Gym_Text_221D0B: @ 8221D0B
MossdeepCity_Gym_Text_TateAndLizaPreRematch: @ 8221D0B
.string "TATE: POKéMON…\n"
.string "LIZA: POKéMON…\p"
.string "TATE: By changing the party's mix…\n"
@@ -622,17 +622,17 @@ MossdeepCity_Gym_Text_221D0B: @ 8221D0B
.string "TATE: Our combination…\n"
.string "LIZA: We'll show you again and again!$"
MossdeepCity_Gym_Text_221E05: @ 8221E05
MossdeepCity_Gym_Text_TateAndLizaRematchDefeat: @ 8221E05
.string "TATE: You and your POKéMON…\n"
.string "LIZA: It's as if you were siblings!$"
MossdeepCity_Gym_Text_221E45: @ 8221E45
MossdeepCity_Gym_Text_TateAndLizaPostRematch: @ 8221E45
.string "TATE: You can knock us down,\n"
.string "but we'll never stay down!\p"
.string "LIZA: Because the two of us,\n"
.string "we always support each other!$"
MossdeepCity_Gym_Text_221EB8: @ 8221EB8
MossdeepCity_Gym_Text_TateAndLizaRematchNeedTwoMons: @ 8221EB8
.string "TATE: You're back again…\n"
.string "LIZA: You're back again…\p"
.string "TATE: To give us a rematch.\n"

2
data/maps/MtChimney/scripts.inc
View File

@@ -8,7 +8,7 @@ MtChimney_OnTransition: @ 822EDCC
end
MtChimney_MapScript1_22EDD2: @ 822EDD2
setstepcallback 1
setstepcallback STEP_CB_ASH
end
MtChimney_EventScript_22EDD5:: @ 822EDD5

2
data/maps/MtPyre_2F/scripts.inc
View File

@@ -5,7 +5,7 @@ MtPyre_2F_MapScripts:: @ 82310FB
.byte 0
MtPyre_2F_MapScript1_23110B: @ 823110B
setstepcallback 7
setstepcallback STEP_CB_CRACKED_FLOOR
setholewarp MAP_MT_PYRE_1F, 255, 0, 0
end

2
data/maps/PacifidlogTown/scripts.inc
View File

@@ -8,7 +8,7 @@ PacifidlogTown_OnTransition: @ 81EBABC
end
PacifidlogTown_MapScript1_1EBAC0: @ 81EBAC0
setstepcallback 3
setstepcallback STEP_CB_PACIFIDLOG_BRIDGE
end
PacifidlogTown_EventScript_1EBAC3:: @ 81EBAC3

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

@@ -51,7 +51,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E
clearflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_PETALBURG_CITY_STATE, 3
fadedefaultbgm
clearflag FLAG_SPECIAL_FLAG_0x4001
clearflag FLAG_DONT_TRANSITION_MUSIC
special LoadPlayerParty
setvar VAR_PETALBURG_GYM_STATE, 1
warp MAP_PETALBURG_CITY_GYM, 255, 4, 108
@@ -78,7 +78,7 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390
waitdooranim
clearflag FLAG_HIDE_MAP_NAME_POPUP
fadedefaultbgm
clearflag FLAG_SPECIAL_FLAG_0x4001
clearflag FLAG_DONT_TRANSITION_MUSIC
warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4
waitstate
releaseall

46
data/maps/PetalburgCity_Gym/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_2049F1",
"script": "PetalburgCity_Gym_EventScript_Norman",
"flag": "FLAG_HIDE_PETALBURG_GYM_NORMAN"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_2054AA",
"script": "PetalburgCity_Gym_EventScript_Mary",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_2053BA",
"script": "PetalburgCity_Gym_EventScript_Randall",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_2053F6",
"script": "PetalburgCity_Gym_EventScript_Parker",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_2054E6",
"script": "PetalburgCity_Gym_EventScript_Alexia",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_205432",
"script": "PetalburgCity_Gym_EventScript_George",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_205522",
"script": "PetalburgCity_Gym_EventScript_Jody",
"flag": "0"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_20546E",
"script": "PetalburgCity_Gym_EventScript_Berke",
"flag": "0"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_20574F",
"script": "PetalburgCity_Gym_EventScript_GymGuide",
"flag": "FLAG_HIDE_PETALBURG_GYM_GREETER"
},
{
@@ -434,7 +434,7 @@
"y": 105,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_205137"
"script": "PetalburgCity_Gym_EventScript_SpeedRoomDoor"
},
{
"type": "sign",
@@ -442,7 +442,7 @@
"y": 105,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_205187"
"script": "PetalburgCity_Gym_EventScript_AccuracyRoomDoor"
},
{
"type": "sign",
@@ -450,7 +450,7 @@
"y": 79,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_2051BC"
"script": "PetalburgCity_Gym_EventScript_ConfusionRoomDoor"
},
{
"type": "sign",
@@ -458,7 +458,7 @@
"y": 79,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_2051EF"
"script": "PetalburgCity_Gym_EventScript_LeftDefenseRoomDoor"
},
{
"type": "sign",
@@ -466,7 +466,7 @@
"y": 92,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_205222"
"script": "PetalburgCity_Gym_EventScript_RightDefenseRoomDoor"
},
{
"type": "sign",
@@ -474,7 +474,7 @@
"y": 92,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_205255"
"script": "PetalburgCity_Gym_EventScript_RecoveryRoomDoor"
},
{
"type": "sign",
@@ -482,7 +482,7 @@
"y": 40,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_205288"
"script": "PetalburgCity_Gym_EventScript_LeftStrengthRoomDoor"
},
{
"type": "sign",
@@ -490,7 +490,7 @@
"y": 53,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_2052BB"
"script": "PetalburgCity_Gym_EventScript_RightStrengthRoomDoor"
},
{
"type": "sign",
@@ -498,7 +498,7 @@
"y": 53,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_2052EE"
"script": "PetalburgCity_Gym_EventScript_LeftOHKORoomDoor"
},
{
"type": "sign",
@@ -506,7 +506,7 @@
"y": 66,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_205321"
"script": "PetalburgCity_Gym_EventScript_RightOHKORoomDoor"
},
{
"type": "sign",
@@ -514,7 +514,7 @@
"y": 14,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_205354"
"script": "PetalburgCity_Gym_EventScript_LeftGymLeadersRoomDoor"
},
{
"type": "sign",
@@ -522,7 +522,7 @@
"y": 27,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_205387"
"script": "PetalburgCity_Gym_EventScript_RightGymLeadersRoomDoor"
},
{
"type": "sign",
@@ -530,7 +530,7 @@
"y": 110,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "PetalburgCity_Gym_EventScript_20576E"
"script": "PetalburgCity_Gym_EventScript_LeftGymStatue"
},
{
"type": "sign",
@@ -538,7 +538,7 @@
"y": 110,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "PetalburgCity_Gym_EventScript_20577E"
"script": "PetalburgCity_Gym_EventScript_RightGymStatue"
}
]
}

999
data/maps/PetalburgCity_Gym/scripts.inc
View File

File diff suppressed because it is too large Load Diff

2
data/maps/Route113/scripts.inc
View File

@@ -4,7 +4,7 @@ Route113_MapScripts:: @ 81F2153
.byte 0
Route113_MapScript1_1F215E: @ 81F215E
setstepcallback 1
setstepcallback STEP_CB_ASH
end
Route113_OnTransition: @ 81F2161

2
data/maps/SkyPillar_2F/scripts.inc
View File

@@ -15,7 +15,7 @@ SkyPillar_2F_EventScript_CleanFloor:: @ 823964C
return
SkyPillar_2F_MapScript1_239650: @ 8239650
setstepcallback 7
setstepcallback STEP_CB_CRACKED_FLOOR
setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0
end

2
data/maps/SkyPillar_4F/scripts.inc
View File

@@ -15,7 +15,7 @@ SkyPillar_4F_EventScript_CleanFloor:: @ 8239692
return
SkyPillar_4F_MapScript1_239696: @ 8239696
setstepcallback 7
setstepcallback STEP_CB_CRACKED_FLOOR
setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0
end

8
data/maps/SootopolisCity_Gym_1F/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SootopolisCity_Gym_1F_EventScript_224F44",
"script": "SootopolisCity_Gym_1F_EventScript_Juan",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SootopolisCity_Gym_1F_EventScript_225040",
"script": "SootopolisCity_Gym_1F_EventScript_GymGuide",
"flag": "0"
}
],
@@ -72,7 +72,7 @@
"y": 24,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SootopolisCity_Gym_1F_EventScript_22505F"
"script": "SootopolisCity_Gym_1F_EventScript_LeftGymStatue"
},
{
"type": "sign",
@@ -80,7 +80,7 @@
"y": 24,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "SootopolisCity_Gym_1F_EventScript_22506F"
"script": "SootopolisCity_Gym_1F_EventScript_RightGymStatue"
}
]
}

160
data/maps/SootopolisCity_Gym_1F/scripts.inc
View File

@@ -1,7 +1,7 @@
SootopolisCity_Gym_1F_MapScripts:: @ 8224E4C
map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_MapScript2_224ECB
map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_MapScript1_224E67
map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_MapScript1_224E6A
map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_OnFrame
map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_OnResume
map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_Gym_1F_OnTransition
.byte 0
@@ -9,71 +9,71 @@ SootopolisCity_Gym_1F_OnTransition: @ 8224E61
setvar VAR_ICE_STEP_COUNT, 1
end
SootopolisCity_Gym_1F_MapScript1_224E67: @ 8224E67
setstepcallback 4
SootopolisCity_Gym_1F_OnResume: @ 8224E67
setstepcallback STEP_CB_SOOTOPOLIS_ICE
end
SootopolisCity_Gym_1F_MapScript1_224E6A: @ 8224E6A
call SootopolisCity_Gym_1F_EventScript_224E73
SootopolisCity_Gym_1F_OnLoad: @ 8224E6A
call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles
special SetSootopolisGymCrackedIceMetatiles
end
SootopolisCity_Gym_1F_EventScript_224E73:: @ 8224E73
SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles:: @ 8224E73
compare VAR_ICE_STEP_COUNT, 8
goto_if_lt SootopolisCity_Gym_1F_EventScript_224ECA
goto_if_lt SootopolisCity_Gym_1F_EventScript_StopCheckingStairs @ All stairs ice
compare VAR_ICE_STEP_COUNT, 28
goto_if_lt SootopolisCity_Gym_1F_EventScript_224EB8
goto_if_lt SootopolisCity_Gym_1F_EventScript_OpenFirstStairs
compare VAR_ICE_STEP_COUNT, 67
goto_if_lt SootopolisCity_Gym_1F_EventScript_224EA6
goto_if_lt SootopolisCity_Gym_1F_EventScript_OpenFirstAndSecondStairs
setmetatile 8, 4, METATILE_SootopolisGym_Stairs, 0
setmetatile 8, 5, METATILE_SootopolisGym_Stairs, 0
SootopolisCity_Gym_1F_EventScript_224EA6:: @ 8224EA6
SootopolisCity_Gym_1F_EventScript_OpenFirstAndSecondStairs:: @ 8224EA6
setmetatile 8, 10, METATILE_SootopolisGym_Stairs, 0
setmetatile 8, 11, METATILE_SootopolisGym_Stairs, 0
SootopolisCity_Gym_1F_EventScript_224EB8:: @ 8224EB8
SootopolisCity_Gym_1F_EventScript_OpenFirstStairs:: @ 8224EB8
setmetatile 8, 15, METATILE_SootopolisGym_Stairs, 0
setmetatile 8, 16, METATILE_SootopolisGym_Stairs, 0
SootopolisCity_Gym_1F_EventScript_224ECA:: @ 8224ECA
SootopolisCity_Gym_1F_EventScript_StopCheckingStairs:: @ 8224ECA
return
SootopolisCity_Gym_1F_MapScript2_224ECB: @ 8224ECB
map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_224EED
map_script_2 VAR_ICE_STEP_COUNT, 28, SootopolisCity_Gym_1F_EventScript_224F01
map_script_2 VAR_ICE_STEP_COUNT, 67, SootopolisCity_Gym_1F_EventScript_224F15
map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_224F29
SootopolisCity_Gym_1F_OnFrame: @ 8224ECB
map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_UnlockFirstStairs
map_script_2 VAR_ICE_STEP_COUNT, 28, SootopolisCity_Gym_1F_EventScript_UnlockSecondStairs
map_script_2 VAR_ICE_STEP_COUNT, 67, SootopolisCity_Gym_1F_EventScript_UnlockThirdStairs
map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_FallThroughIce
.2byte 0
SootopolisCity_Gym_1F_EventScript_224EED:: @ 8224EED
SootopolisCity_Gym_1F_EventScript_UnlockFirstStairs:: @ 8224EED
addvar VAR_ICE_STEP_COUNT, 1
delay 40
playse SE_RU_GASHIN
call SootopolisCity_Gym_1F_EventScript_224E73
call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles
special DrawWholeMapView
end
SootopolisCity_Gym_1F_EventScript_224F01:: @ 8224F01
SootopolisCity_Gym_1F_EventScript_UnlockSecondStairs:: @ 8224F01
addvar VAR_ICE_STEP_COUNT, 1
delay 40
playse SE_RU_GASHIN
call SootopolisCity_Gym_1F_EventScript_224E73
call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles
special DrawWholeMapView
end
SootopolisCity_Gym_1F_EventScript_224F15:: @ 8224F15
SootopolisCity_Gym_1F_EventScript_UnlockThirdStairs:: @ 8224F15
addvar VAR_ICE_STEP_COUNT, 1
delay 40
playse SE_RU_GASHIN
call SootopolisCity_Gym_1F_EventScript_224E73
call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles
special DrawWholeMapView
end
SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29
SootopolisCity_Gym_1F_EventScript_FallThroughIce:: @ 8224F29
lockall
delay 20
applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Gym_1F_Movement_224F42
applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Gym_1F_Movement_FallThroughIce
waitmovement 0
playse SE_RU_HYUU
delay 60
@@ -81,26 +81,26 @@ SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29
waitstate
end
SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42
SootopolisCity_Gym_1F_Movement_FallThroughIce: @ 8224F42
set_invisible
step_end
SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44
trainerbattle_single TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82, NO_MUSIC
SootopolisCity_Gym_1F_EventScript_Juan:: @ 8224F44
trainerbattle_single TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_JuanPreBattle, SootopolisCity_Gym_1F_Text_JuanDefeat, SootopolisCity_Gym_1F_EventScript_JuanDefeated, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq SootopolisCity_Gym_1F_EventScript_225025
goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_224FF7
goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_22501B
msgbox SootopolisCity_Gym_1F_Text_225778, MSGBOX_DEFAULT
compare VAR_RESULT, TRUE
goto_if_eq SootopolisCity_Gym_1F_EventScript_JuanRematch
goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_GiveWaterPulse2
goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_GoGetFortreeBadge
msgbox SootopolisCity_Gym_1F_Text_JuanPostBattle, MSGBOX_DEFAULT
release
end
SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82
message SootopolisCity_Gym_1F_Text_225598
SootopolisCity_Gym_1F_EventScript_JuanDefeated:: @ 8224F82
message SootopolisCity_Gym_1F_Text_ReceivedRainBadge
waitmessage
call Common_EventScript_PlayGymBadgeFanfare
msgbox SootopolisCity_Gym_1F_Text_2255BE, MSGBOX_DEFAULT
msgbox SootopolisCity_Gym_1F_Text_ExplainRainBadgeTakeThis, MSGBOX_DEFAULT
setflag FLAG_DEFEATED_SOOTOPOLIS_GYM
setflag FLAG_BADGE08_GET
setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS
@@ -110,11 +110,11 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82
clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1
setvar VAR_0x8008, 8
call Common_EventScript_SetGymTrainers
call SootopolisCity_Gym_1F_EventScript_224FD4
call SootopolisCity_Gym_1F_EventScript_GiveWaterPulse
closemessage
delay 30
playfanfare MUS_ME_TORE_EYE
msgbox SootopolisCity_Gym_1F_Text_22574D, MSGBOX_DEFAULT
msgbox SootopolisCity_Gym_1F_Text_RegisteredJuan, MSGBOX_DEFAULT
waitfanfare
closemessage
delay 30
@@ -122,69 +122,69 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82
release
end
SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4
SootopolisCity_Gym_1F_EventScript_GiveWaterPulse:: @ 8224FD4
giveitem_std ITEM_TM03
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_BagIsFull
msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT
msgbox SootopolisCity_Gym_1F_Text_ExplainWaterPulse, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_TM03
return
SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7
SootopolisCity_Gym_1F_EventScript_GiveWaterPulse2:: @ 8224FF7
giveitem_std ITEM_TM03
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT
msgbox SootopolisCity_Gym_1F_Text_ExplainWaterPulse, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_TM03
release
end
SootopolisCity_Gym_1F_EventScript_22501B:: @ 822501B
msgbox SootopolisCity_Gym_1F_Text_225865, MSGBOX_DEFAULT
SootopolisCity_Gym_1F_EventScript_GoGetFortreeBadge:: @ 822501B
msgbox SootopolisCity_Gym_1F_Text_GoGetFortreeBadge, MSGBOX_DEFAULT
release
end
SootopolisCity_Gym_1F_EventScript_225025:: @ 8225025
trainerbattle_rematch_double TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_225950, SootopolisCity_Gym_1F_Text_225A2E, SootopolisCity_Gym_1F_Text_225B48
msgbox SootopolisCity_Gym_1F_Text_225A67, MSGBOX_AUTOCLOSE
SootopolisCity_Gym_1F_EventScript_JuanRematch:: @ 8225025
trainerbattle_rematch_double TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_JuanPreRematch, SootopolisCity_Gym_1F_Text_JuanRematchDefeat, SootopolisCity_Gym_1F_Text_JuanRematchNeedTwoMons
msgbox SootopolisCity_Gym_1F_Text_JuanPostRematch, MSGBOX_AUTOCLOSE
end
SootopolisCity_Gym_1F_EventScript_225040:: @ 8225040
SootopolisCity_Gym_1F_EventScript_GymGuide:: @ 8225040
lock
faceplayer
goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_225055
msgbox SootopolisCity_Gym_1F_Text_225093, MSGBOX_DEFAULT
goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_GymGuidePostVictory
msgbox SootopolisCity_Gym_1F_Text_GymGuideAdvice, MSGBOX_DEFAULT
release
end
SootopolisCity_Gym_1F_EventScript_225055:: @ 8225055
msgbox SootopolisCity_Gym_1F_Text_2251AF, MSGBOX_DEFAULT
SootopolisCity_Gym_1F_EventScript_GymGuidePostVictory:: @ 8225055
msgbox SootopolisCity_Gym_1F_Text_GymGuidePostVictory, MSGBOX_DEFAULT
release
end
SootopolisCity_Gym_1F_EventScript_22505F:: @ 822505F
SootopolisCity_Gym_1F_EventScript_LeftGymStatue:: @ 822505F
lockall
goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_22507F
goto SootopolisCity_Gym_1F_EventScript_225089
goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_GymStatueCertified
goto SootopolisCity_Gym_1F_EventScript_GymStatue
end
SootopolisCity_Gym_1F_EventScript_22506F:: @ 822506F
SootopolisCity_Gym_1F_EventScript_RightGymStatue:: @ 822506F
lockall
goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_22507F
goto SootopolisCity_Gym_1F_EventScript_225089
goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_GymStatueCertified
goto SootopolisCity_Gym_1F_EventScript_GymStatue
end
SootopolisCity_Gym_1F_EventScript_22507F:: @ 822507F
msgbox SootopolisCity_Gym_1F_Text_225916, MSGBOX_DEFAULT
SootopolisCity_Gym_1F_EventScript_GymStatueCertified:: @ 822507F
msgbox SootopolisCity_Gym_1F_Text_GymStatueCertified, MSGBOX_DEFAULT
releaseall
end
SootopolisCity_Gym_1F_EventScript_225089:: @ 8225089
msgbox SootopolisCity_Gym_1F_Text_2258FA, MSGBOX_DEFAULT
SootopolisCity_Gym_1F_EventScript_GymStatue:: @ 8225089
msgbox SootopolisCity_Gym_1F_Text_GymStatue, MSGBOX_DEFAULT
releaseall
end
SootopolisCity_Gym_1F_Text_225093: @ 8225093
SootopolisCity_Gym_1F_Text_GymGuideAdvice: @ 8225093
.string "Yo! How's it going, CHAMPION-\n"
.string "bound {PLAYER}?\p"
.string "SOOTOPOLIS's GYM LEADER JUAN is\n"
@@ -196,14 +196,14 @@ SootopolisCity_Gym_1F_Text_225093: @ 8225093
.string "The rest of the way, you have to\n"
.string "go for it yourself!$"
SootopolisCity_Gym_1F_Text_2251AF: @ 82251AF
SootopolisCity_Gym_1F_Text_GymGuidePostVictory: @ 82251AF
.string "Yow! You've beaten even JUAN, who\n"
.string "was supposedly the best in all HOENN!\p"
.string "Okay! Check out your TRAINER CARD.\p"
.string "If you've gotten all the BADGES, you're\n"
.string "set for the POKéMON LEAGUE challenge!$"
SootopolisCity_Gym_1F_Text_225268: @ 8225268
SootopolisCity_Gym_1F_Text_JuanPreBattle: @ 8225268
.string "Let me ask you.\n"
.string "Did you know?\l"
.string "Ah, I should not be so coy.\p"
@@ -226,7 +226,7 @@ SootopolisCity_Gym_1F_Text_225268: @ 8225268
@ the gDisplayedStringBattle buffer that it's put into, and it stomps all over the gBattleTextBuffs
@ after, as well as the otherwise unused array after that. One wonders if that's the reason for
@ the existence of that unused array of ints.
SootopolisCity_Gym_1F_Text_225432: @ 8225432
SootopolisCity_Gym_1F_Text_JuanDefeat: @ 8225432
.string "Ahahaha, excellent!\n"
.string "Very well, you are the winner.\p"
.string "From you, I sense the brilliant shine\n"
@@ -241,11 +241,11 @@ SootopolisCity_Gym_1F_Text_225432: @ 8225432
.string "Rather than my clothes, I shall reward\n"
.string "you with this, the RAIN BADGE!$"
SootopolisCity_Gym_1F_Text_225598: @ 8225598
SootopolisCity_Gym_1F_Text_ReceivedRainBadge: @ 8225598
.string "{PLAYER} received the RAIN BADGE\n"
.string "from JUAN.$"
SootopolisCity_Gym_1F_Text_2255BE: @ 82255BE
SootopolisCity_Gym_1F_Text_ExplainRainBadgeTakeThis: @ 82255BE
.string "Having the RAIN BADGE shall assure you\n"
.string "the full obedience of all your POKéMON\l"
.string "to your every command.\p"
@@ -255,18 +255,18 @@ SootopolisCity_Gym_1F_Text_2255BE: @ 82255BE
.string "And, so that you never forget the\n"
.string "battle we shared, take this…$"
SootopolisCity_Gym_1F_Text_2256C1: @ 82256C1
SootopolisCity_Gym_1F_Text_ExplainWaterPulse: @ 82256C1
.string "The TECHNICAL MACHINE I handed you\n"
.string "contains WATER PULSE.\p"
.string "In use, it will occasionally confuse\n"
.string "the target with ultrasonic waves.\p"
.string "… … … … … …$"
SootopolisCity_Gym_1F_Text_22574D: @ 822574D
SootopolisCity_Gym_1F_Text_RegisteredJuan: @ 822574D
.string "Registered GYM LEADER JUAN\n"
.string "in the POKéNAV.$"
SootopolisCity_Gym_1F_Text_225778: @ 8225778
SootopolisCity_Gym_1F_Text_JuanPostBattle: @ 8225778
.string "The TRAINERS who have gathered all\n"
.string "the GYM BADGES of HOENN should make\l"
.string "way to the ultimate destination.\p"
@@ -276,22 +276,22 @@ SootopolisCity_Gym_1F_Text_225778: @ 8225778
.string "There, you shall find the POKéMON\n"
.string "LEAGUE.$"
SootopolisCity_Gym_1F_Text_225865: @ 8225865
SootopolisCity_Gym_1F_Text_GoGetFortreeBadge: @ 8225865
.string "There remains but one BADGE to\n"
.string "obtain in HOENN.\p"
.string "If you wish to challenge the POKéMON\n"
.string "LEAGUE, you must obtain the last\l"
.string "BADGE from the GYM in FORTREE.$"
SootopolisCity_Gym_1F_Text_2258FA: @ 82258FA
SootopolisCity_Gym_1F_Text_GymStatue: @ 82258FA
.string "SOOTOPOLIS CITY POKéMON GYM$"
SootopolisCity_Gym_1F_Text_225916: @ 8225916
SootopolisCity_Gym_1F_Text_GymStatueCertified: @ 8225916
.string "SOOTOPOLIS CITY POKéMON GYM\p"
.string "JUAN'S CERTIFIED TRAINERS:\n"
.string "{PLAYER}$"
SootopolisCity_Gym_1F_Text_225950: @ 8225950
SootopolisCity_Gym_1F_Text_JuanPreRematch: @ 8225950
.string "JUAN: Ah, this GYM had returned to its\n"
.string "usual state of serenity…\p"
.string "But our young typhoon has returned\n"
@@ -300,11 +300,11 @@ SootopolisCity_Gym_1F_Text_225950: @ 8225950
.string "I shall be delighted to dance with you\n"
.string "as often as you wish!$"
SootopolisCity_Gym_1F_Text_225A2E: @ 8225A2E
SootopolisCity_Gym_1F_Text_JuanRematchDefeat: @ 8225A2E
.string "Ahahaha, you are the winner!\n"
.string "You have defeated me again!$"
SootopolisCity_Gym_1F_Text_225A67: @ 8225A67
SootopolisCity_Gym_1F_Text_JuanPostRematch: @ 8225A67
.string "JUAN: If I told you to become my\n"
.string "apprentice, you will refuse, I am sure.\p"
.string "I would like to make a gift of my coat\n"
@@ -314,7 +314,7 @@ SootopolisCity_Gym_1F_Text_225A67: @ 8225A67
.string "And that, my friend, is a certain sign\n"
.string "of nobility!$"
SootopolisCity_Gym_1F_Text_225B48: @ 8225B48
SootopolisCity_Gym_1F_Text_JuanRematchNeedTwoMons: @ 8225B48
.string "JUAN: Ah, this GYM had returned to its\n"
.string "usual state of serenity…\p"
.string "But our young typhoon has returned\n"

20
data/maps/SootopolisCity_Gym_B1F/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
"script": "SootopolisCity_Gym_B1F_EventScript_225C8B",
"script": "SootopolisCity_Gym_B1F_EventScript_Andrea",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
"script": "SootopolisCity_Gym_B1F_EventScript_225CD0",
"script": "SootopolisCity_Gym_B1F_EventScript_Connie",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
"script": "SootopolisCity_Gym_B1F_EventScript_225CB9",
"script": "SootopolisCity_Gym_B1F_EventScript_Brianna",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5",
"script": "SootopolisCity_Gym_B1F_EventScript_225CE7",
"script": "SootopolisCity_Gym_B1F_EventScript_Bridget",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
"script": "SootopolisCity_Gym_B1F_EventScript_225D15",
"script": "SootopolisCity_Gym_B1F_EventScript_Tiffany",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
"script": "SootopolisCity_Gym_B1F_EventScript_225D2C",
"script": "SootopolisCity_Gym_B1F_EventScript_Bethany",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
"script": "SootopolisCity_Gym_B1F_EventScript_225CA2",
"script": "SootopolisCity_Gym_B1F_EventScript_Crissy",
"flag": "0"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "SootopolisCity_Gym_B1F_EventScript_225CFE",
"script": "SootopolisCity_Gym_B1F_EventScript_Olivia",
"flag": "0"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "SootopolisCity_Gym_B1F_EventScript_225D5A",
"script": "SootopolisCity_Gym_B1F_EventScript_Daphne",
"flag": "0"
},
{
@@ -141,7 +141,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
"script": "SootopolisCity_Gym_B1F_EventScript_225D43",
"script": "SootopolisCity_Gym_B1F_EventScript_Annika",
"flag": "0"
}
],

120
data/maps/SootopolisCity_Gym_B1F/scripts.inc
View File

@@ -1,183 +1,183 @@
SootopolisCity_Gym_B1F_MapScripts:: @ 8225C8A
.byte 0
SootopolisCity_Gym_B1F_EventScript_225C8B:: @ 8225C8B
trainerbattle_single TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_225D71, SootopolisCity_Gym_B1F_Text_225DB6
msgbox SootopolisCity_Gym_B1F_Text_225DCF, MSGBOX_AUTOCLOSE
SootopolisCity_Gym_B1F_EventScript_Andrea:: @ 8225C8B
trainerbattle_single TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_AndreaPreBattle, SootopolisCity_Gym_B1F_Text_AndreaDefeat
msgbox SootopolisCity_Gym_B1F_Text_AndreaPostBattle, MSGBOX_AUTOCLOSE
end
SootopolisCity_Gym_B1F_EventScript_225CA2:: @ 8225CA2
trainerbattle_single TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_225E04, SootopolisCity_Gym_B1F_Text_225E60
msgbox SootopolisCity_Gym_B1F_Text_225E90, MSGBOX_AUTOCLOSE
SootopolisCity_Gym_B1F_EventScript_Crissy:: @ 8225CA2
trainerbattle_single TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_CrissyPreBattle, SootopolisCity_Gym_B1F_Text_CrissyDefeat
msgbox SootopolisCity_Gym_B1F_Text_CrissyPostBattle, MSGBOX_AUTOCLOSE
end
SootopolisCity_Gym_B1F_EventScript_225CB9:: @ 8225CB9
trainerbattle_single TRAINER_BRIANNA, SootopolisCity_Gym_B1F_Text_22646E, SootopolisCity_Gym_B1F_Text_226495
msgbox SootopolisCity_Gym_B1F_Text_2264BC, MSGBOX_AUTOCLOSE
SootopolisCity_Gym_B1F_EventScript_Brianna:: @ 8225CB9
trainerbattle_single TRAINER_BRIANNA, SootopolisCity_Gym_B1F_Text_BriannaPreBattle, SootopolisCity_Gym_B1F_Text_BriannaDefeat
msgbox SootopolisCity_Gym_B1F_Text_BriannaPostBattle, MSGBOX_AUTOCLOSE
end
SootopolisCity_Gym_B1F_EventScript_225CD0:: @ 8225CD0
trainerbattle_single TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_225FBE, SootopolisCity_Gym_B1F_Text_225FEB
msgbox SootopolisCity_Gym_B1F_Text_225FFE, MSGBOX_AUTOCLOSE
SootopolisCity_Gym_B1F_EventScript_Connie:: @ 8225CD0
trainerbattle_single TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_ConniePreBattle, SootopolisCity_Gym_B1F_Text_ConnieDefeat
msgbox SootopolisCity_Gym_B1F_Text_ConniePostBattle, MSGBOX_AUTOCLOSE
end
SootopolisCity_Gym_B1F_EventScript_225CE7:: @ 8225CE7
trainerbattle_single TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_226061, SootopolisCity_Gym_B1F_Text_2260B6
msgbox SootopolisCity_Gym_B1F_Text_2260D1, MSGBOX_AUTOCLOSE
SootopolisCity_Gym_B1F_EventScript_Bridget:: @ 8225CE7
trainerbattle_single TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_BridgetPreBattle, SootopolisCity_Gym_B1F_Text_BridgetDefeat
msgbox SootopolisCity_Gym_B1F_Text_BridgetPostBattle, MSGBOX_AUTOCLOSE
end
SootopolisCity_Gym_B1F_EventScript_225CFE:: @ 8225CFE
trainerbattle_single TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_226164, SootopolisCity_Gym_B1F_Text_2261A7
msgbox SootopolisCity_Gym_B1F_Text_2261B5, MSGBOX_AUTOCLOSE
SootopolisCity_Gym_B1F_EventScript_Olivia:: @ 8225CFE
trainerbattle_single TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_OliviaPreBattle, SootopolisCity_Gym_B1F_Text_OliviaDefeat
msgbox SootopolisCity_Gym_B1F_Text_OliviaPostBattle, MSGBOX_AUTOCLOSE
end
SootopolisCity_Gym_B1F_EventScript_225D15:: @ 8225D15
trainerbattle_single TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_2261F7, SootopolisCity_Gym_B1F_Text_226274
msgbox SootopolisCity_Gym_B1F_Text_226286, MSGBOX_AUTOCLOSE
SootopolisCity_Gym_B1F_EventScript_Tiffany:: @ 8225D15
trainerbattle_single TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_TiffanyPreBattle, SootopolisCity_Gym_B1F_Text_TiffanyDefeat
msgbox SootopolisCity_Gym_B1F_Text_TiffanyPostBattle, MSGBOX_AUTOCLOSE
end
SootopolisCity_Gym_B1F_EventScript_225D2C:: @ 8225D2C
trainerbattle_single TRAINER_BETHANY, SootopolisCity_Gym_B1F_Text_2262F3, SootopolisCity_Gym_B1F_Text_22633B
msgbox SootopolisCity_Gym_B1F_Text_226341, MSGBOX_AUTOCLOSE
SootopolisCity_Gym_B1F_EventScript_Bethany:: @ 8225D2C
trainerbattle_single TRAINER_BETHANY, SootopolisCity_Gym_B1F_Text_BethanyPreBattle, SootopolisCity_Gym_B1F_Text_BethanyDefeat
msgbox SootopolisCity_Gym_B1F_Text_BethanyPostBattle, MSGBOX_AUTOCLOSE
end
SootopolisCity_Gym_B1F_EventScript_225D43:: @ 8225D43
trainerbattle_single TRAINER_ANNIKA, SootopolisCity_Gym_B1F_Text_226388, SootopolisCity_Gym_B1F_Text_2263BD
msgbox SootopolisCity_Gym_B1F_Text_2263F4, MSGBOX_AUTOCLOSE
SootopolisCity_Gym_B1F_EventScript_Annika:: @ 8225D43
trainerbattle_single TRAINER_ANNIKA, SootopolisCity_Gym_B1F_Text_AnnikaPreBattle, SootopolisCity_Gym_B1F_Text_AnnikaDefeat
msgbox SootopolisCity_Gym_B1F_Text_AnnikaPostBattle, MSGBOX_AUTOCLOSE
end
SootopolisCity_Gym_B1F_EventScript_225D5A:: @ 8225D5A
trainerbattle_single TRAINER_DAPHNE, SootopolisCity_Gym_B1F_Text_225ED6, SootopolisCity_Gym_B1F_Text_225F35
msgbox SootopolisCity_Gym_B1F_Text_225F67, MSGBOX_AUTOCLOSE
SootopolisCity_Gym_B1F_EventScript_Daphne:: @ 8225D5A
trainerbattle_single TRAINER_DAPHNE, SootopolisCity_Gym_B1F_Text_DaphnePreBattle, SootopolisCity_Gym_B1F_Text_DaphneDefeat
msgbox SootopolisCity_Gym_B1F_Text_DaphnePostBattle, MSGBOX_AUTOCLOSE
end
SootopolisCity_Gym_B1F_Text_225D71: @ 8225D71
SootopolisCity_Gym_B1F_Text_AndreaPreBattle: @ 8225D71
.string "I'll show you the sublime techniques\n"
.string "I learned from our LEADER JUAN!$"
SootopolisCity_Gym_B1F_Text_225DB6: @ 8225DB6
SootopolisCity_Gym_B1F_Text_AndreaDefeat: @ 8225DB6
.string "Please forgive me, JUAN…$"
SootopolisCity_Gym_B1F_Text_225DCF: @ 8225DCF
SootopolisCity_Gym_B1F_Text_AndreaPostBattle: @ 8225DCF
.string "Watch what happens if you crack all\n"
.string "the floor tiles.$"
SootopolisCity_Gym_B1F_Text_225E04: @ 8225E04
SootopolisCity_Gym_B1F_Text_CrissyPreBattle: @ 8225E04
.string "You came all the way here, but you won't\n"
.string "get to see JUAN.\p"
.string "Not if you lose to me, you won't!$"
SootopolisCity_Gym_B1F_Text_225E60: @ 8225E60
SootopolisCity_Gym_B1F_Text_CrissyDefeat: @ 8225E60
.string "You're strong!\n"
.string "I was fooled by your cute looks!$"
SootopolisCity_Gym_B1F_Text_225E90: @ 8225E90
SootopolisCity_Gym_B1F_Text_CrissyPostBattle: @ 8225E90
.string "You might be good enough to avoid\n"
.string "being wiped out in one hit by JUAN.$"
SootopolisCity_Gym_B1F_Text_225ED6: @ 8225ED6
SootopolisCity_Gym_B1F_Text_DaphnePreBattle: @ 8225ED6
.string "The sight of JUAN conducting\n"
.string "a battle…\p"
.string "The very beauty of it compelled me to\n"
.string "become a TRAINER.$"
SootopolisCity_Gym_B1F_Text_225F35: @ 8225F35
SootopolisCity_Gym_B1F_Text_DaphneDefeat: @ 8225F35
.string "You battled with more beauty than\n"
.string "I could muster…$"
SootopolisCity_Gym_B1F_Text_225F67: @ 8225F67
SootopolisCity_Gym_B1F_Text_DaphnePostBattle: @ 8225F67
.string "The grace you bring to battle is\n"
.string "fabulous.\p"
.string "Oh… I'm so fortunate to have found\n"
.string "POKéMON.$"
SootopolisCity_Gym_B1F_Text_225FBE: @ 8225FBE
SootopolisCity_Gym_B1F_Text_ConniePreBattle: @ 8225FBE
.string "I should teach you how harsh battles\n"
.string "can be.$"
SootopolisCity_Gym_B1F_Text_225FEB: @ 8225FEB
SootopolisCity_Gym_B1F_Text_ConnieDefeat: @ 8225FEB
.string "Oh.\n"
.string "You're strong.$"
SootopolisCity_Gym_B1F_Text_225FFE: @ 8225FFE
SootopolisCity_Gym_B1F_Text_ConniePostBattle: @ 8225FFE
.string "I'll tell you something good.\p"
.string "If you want to reach JUAN, you\n"
.string "need to walk on each floor tile once.$"
SootopolisCity_Gym_B1F_Text_226061: @ 8226061
SootopolisCity_Gym_B1F_Text_BridgetPreBattle: @ 8226061
.string "The POKéMON GYM of the highest level\n"
.string "in the HOENN region…\p"
.string "That's the SOOTOPOLIS GYM.$"
SootopolisCity_Gym_B1F_Text_2260B6: @ 82260B6
SootopolisCity_Gym_B1F_Text_BridgetDefeat: @ 82260B6
.string "What a high level you are!$"
SootopolisCity_Gym_B1F_Text_2260D1: @ 82260D1
SootopolisCity_Gym_B1F_Text_BridgetPostBattle: @ 82260D1
.string "Rather than being satisfied by being\n"
.string "in a strong GYM, I imagine training in\l"
.string "other places will make you stronger.\l"
.string "But above all, it looks more fun.$"
SootopolisCity_Gym_B1F_Text_226164: @ 8226164
SootopolisCity_Gym_B1F_Text_OliviaPreBattle: @ 8226164
.string "I train my POKéMON together with\n"
.string "JUAN.\p"
.string "Don't think I'm a pushover.$"
SootopolisCity_Gym_B1F_Text_2261A7: @ 82261A7
SootopolisCity_Gym_B1F_Text_OliviaDefeat: @ 82261A7
.string "I was beaten…$"
SootopolisCity_Gym_B1F_Text_2261B5: @ 82261B5
SootopolisCity_Gym_B1F_Text_OliviaPostBattle: @ 82261B5
.string "I think you have potential.\n"
.string "Why don't you stay and train with us?$"
SootopolisCity_Gym_B1F_Text_2261F7: @ 82261F7
SootopolisCity_Gym_B1F_Text_TiffanyPreBattle: @ 82261F7
.string "A graceful glide across the ice while\n"
.string "crossing no lines…\p"
.string "A TRAINER putting on that performance\n"
.string "would be elegantly beautiful!$"
SootopolisCity_Gym_B1F_Text_226274: @ 8226274
SootopolisCity_Gym_B1F_Text_TiffanyDefeat: @ 8226274
.string "Well, excuse me?!$"
SootopolisCity_Gym_B1F_Text_226286: @ 8226286
SootopolisCity_Gym_B1F_Text_TiffanyPostBattle: @ 8226286
.string "This is really obvious, but how strong\n"
.string "you are as a TRAINER has nothing to do\l"
.string "with how young or old you are.$"
SootopolisCity_Gym_B1F_Text_2262F3: @ 82262F3
SootopolisCity_Gym_B1F_Text_BethanyPreBattle: @ 82262F3
.string "When I'm with my POKéMON, the time\n"
.string "flies by before you can say, “Oops!”$"
SootopolisCity_Gym_B1F_Text_22633B: @ 822633B
SootopolisCity_Gym_B1F_Text_BethanyDefeat: @ 822633B
.string "Oops!$"
SootopolisCity_Gym_B1F_Text_226341: @ 8226341
SootopolisCity_Gym_B1F_Text_BethanyPostBattle: @ 8226341
.string "I wish I could forget about lost causes\n"
.string "before I can manage an “Oops!”$"
SootopolisCity_Gym_B1F_Text_226388: @ 8226388
SootopolisCity_Gym_B1F_Text_AnnikaPreBattle: @ 8226388
.string "I can battle with really rare POKéMON\n"
.string "if you'd like.$"
SootopolisCity_Gym_B1F_Text_2263BD: @ 82263BD
SootopolisCity_Gym_B1F_Text_AnnikaDefeat: @ 82263BD
.string "Oh, there now! Did you have a good look\n"
.string "at my POKéMON?$"
SootopolisCity_Gym_B1F_Text_2263F4: @ 82263F4
SootopolisCity_Gym_B1F_Text_AnnikaPostBattle: @ 82263F4
.string "I came to this GYM because JUAN\n"
.string "praised me for my darling POKéMON.\p"
.string "Oh, if only I'd met JUAN years ago\n"
.string "when I was younger…$"
SootopolisCity_Gym_B1F_Text_22646E: @ 822646E
SootopolisCity_Gym_B1F_Text_BriannaPreBattle: @ 822646E
.string "Giggle…\n"
.string "Your grim look is so charming.$"
SootopolisCity_Gym_B1F_Text_226495: @ 8226495
SootopolisCity_Gym_B1F_Text_BriannaDefeat: @ 8226495
.string "Oh, dear.\n"
.string "I went much too easy on you.$"
SootopolisCity_Gym_B1F_Text_2264BC: @ 82264BC
SootopolisCity_Gym_B1F_Text_BriannaPostBattle: @ 82264BC
.string "You couldn't lay a finger on JUAN,\n"
.string "I'm sure. Giggle…$"

8
data/mossdeep_gym.s
View File

@@ -26,18 +26,18 @@ gUnknown_086126A4:: @ 86126A4
free_unlock_anim
step_end
gUnknown_086126A8:: @ 86126A8
MossdeepGym_Movement_FaceRight:: @ 86126A8
face_right
step_end
gUnknown_086126AA:: @ 86126AA
MossdeepGym_Movement_FaceDown:: @ 86126AA
face_down
step_end
gUnknown_086126AC:: @ 86126AC
MossdeepGym_Movement_FaceLeft:: @ 86126AC
face_left
step_end
gUnknown_086126AE:: @ 86126AE
MossdeepGym_Movement_FaceUp:: @ 86126AE
face_up
step_end

2
data/scripts/shared_secret_base.inc
View File

@@ -20,7 +20,7 @@ SecretBase_MapScript2_OnFrame: @ 823B4AE
.2byte 0
SecretBase_MapScript1_OnResume: @ 823B4B8
setstepcallback 6
setstepcallback STEP_CB_SECRET_BASE
end
SecretBase_EventScript_PC:: @ 823B4BB

4
data/specials.inc
View File

@@ -156,8 +156,8 @@ gSpecials:: @ 81DBA64
def_special DrawWholeMapView
def_special StorePlayerCoordsInVars
def_special MauvilleGymSpecial3
def_special PetalburgGymSpecial1
def_special PetalburgGymSpecial2
def_special PetalburgGymSlideOpenRoomDoors
def_special PetalburgGymUnlockRoomDoors
def_special GetPlayerTrainerIdOnesDigit
def_special GetPlayerBigGuyGirlString
def_special GetRivalSonDaughterString

2
data/text/berries.inc
View File

@@ -1,4 +1,4 @@
PetalburgCity_Gym_Text_2A6D3D: @ 82A6D3D
PetalburgCity_Gym_Text_GiveEnigmaBerry: @ 82A6D3D
.string "DAD: Hi, {PLAYER}!\p"
.string "I just received a very rare BERRY.\n"
.string "I'd like you to have it.$"

13
include/constants/field_tasks.h Normal file
View File

@@ -0,0 +1,13 @@
#ifndef GUARD_CONSTANTS_FIELD_TASKS_H
#define GUARD_CONSTANTS_FIELD_TASKS_H
#define STEP_CB_DUMMY 0
#define STEP_CB_ASH 1
#define STEP_CB_FORTREE_BRIDGE 2
#define STEP_CB_PACIFIDLOG_BRIDGE 3
#define STEP_CB_SOOTOPOLIS_ICE 4
#define STEP_CB_TRUCK 5
#define STEP_CB_SECRET_BASE 6
#define STEP_CB_CRACKED_FLOOR 7
#endif // GUARD_CONSTANTS_FIELD_TASKS_H

2
include/constants/flags.h
View File

@@ -1549,7 +1549,7 @@
// Special Flags (Unknown)
#define SPECIAL_FLAGS_START 0x4000
#define FLAG_HIDE_MAP_NAME_POPUP 0x4000
#define FLAG_SPECIAL_FLAG_0x4001 0x4001
#define FLAG_DONT_TRANSITION_MUSIC 0x4001
#define FLAG_SPECIAL_FLAG_0x4002 0x4002
#define FLAG_SPECIAL_FLAG_0x4003 0x4003
#define FLAG_SPECIAL_FLAG_0x4004 0x4004

2
include/constants/metatile_labels.h
View File

@@ -75,6 +75,8 @@
#define METATILE_MossdeepGym_OuterWall_RightCorner 0x205
#define METATILE_MossdeepGym_Empty0 0x238
#define METATILE_MossdeepGym_Empty1 0x239
#define METATILE_MossdeepGym_YellowRightArrow 0x250
// gTileset_BrendansMaysHouse
#define METATILE_BrendansMaysHouse_BrendanPC_Off 0x25A

2
include/constants/vars.h
View File

@@ -147,7 +147,7 @@
#define VAR_LITTLEROOT_HOUSES_STATE 0x4082
#define VAR_UNUSED_0x4083 0x4083 // Unused Var
#define VAR_BIRCH_LAB_STATE 0x4084
#define VAR_PETALBURG_GYM_STATE 0x4085
#define VAR_PETALBURG_GYM_STATE 0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman
#define VAR_LINK_CONTEST_ROOM_STATE 0x4086
#define VAR_CABLE_CLUB_STATE 0x4087
#define VAR_CONTEST_LOCATION 0x4088

4
src/field_special_scene.c
View File

@@ -302,7 +302,7 @@ void Task_HandlePorthole(u8 taskId)
}
break;
case EXIT_PORTHOLE: // exit porthole.
FlagClear(FLAG_SPECIAL_FLAG_0x4001);
FlagClear(FLAG_DONT_TRANSITION_MUSIC);
FlagClear(FLAG_HIDE_MAP_NAME_POPUP);
SetWarpDestinationToDynamicWarp(0);
DoDiveWarp();
@@ -339,7 +339,7 @@ void sub_80FB768(void)
void sub_80FB7A4(void)
{
FlagSet(FLAG_SYS_CRUISE_MODE);
FlagSet(FLAG_SPECIAL_FLAG_0x4001);
FlagSet(FLAG_DONT_TRANSITION_MUSIC);
FlagSet(FLAG_HIDE_MAP_NAME_POPUP);
SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
sub_80FB59C();

36
src/field_specials.c
View File

@@ -68,8 +68,8 @@
EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE;
EWRAM_DATA u8 gBikeCollisions = 0;
static EWRAM_DATA u32 sBikeCyclingTimer = 0;
static EWRAM_DATA u8 sUnknown_0203AB5C = 0;
static EWRAM_DATA u8 sPetalburgGymSlidingDoorFrameCounter = 0;
static EWRAM_DATA u8 sSlidingDoorNextFrameCounter = 0;
static EWRAM_DATA u8 sSlidingDoorFrame = 0;
static EWRAM_DATA u8 sTutorMoveAndElevatorWindowId = 0;
static EWRAM_DATA u16 sLilycoveDeptStore_NeverRead = 0;
static EWRAM_DATA u16 sLilycoveDeptStore_DefaultFloorChoice = 0;
@@ -95,8 +95,8 @@ u16 GetNumMovedLilycoveFanClubMembers(void);
static void RecordCyclingRoadResults(u32, u8);
static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum);
static void Task_PetalburgGym(u8);
static void PetalburgGymFunc(u8, u16);
static void Task_PetalburgGymSlideOpenRoomDoors(u8 taskId);
static void PetalburgGymSetDoorMetatiles(u8 roomNumber, u16 metatileId);
static void Task_PCTurnOnEffect(u8);
static void PCTurnOnEffect_0(struct Task *);
static void PCTurnOnEffect_1(s16, s8, s8);
@@ -814,7 +814,7 @@ void MauvilleGymSpecial3(void)
}
}
static const u8 gUnknown_085B2B78[] = {0, 1, 1, 1, 1};
static const bool8 sSlidingDoorNextFrameDelay[] = {0, 1, 1, 1, 1};
static const u16 sPetalburgGymSlidingDoorMetatiles[] = {
METATILE_ID(PetalburgGym, SlidingDoor_Frame0),
@@ -824,21 +824,21 @@ static const u16 sPetalburgGymSlidingDoorMetatiles[] = {
METATILE_ID(PetalburgGym, SlidingDoor_Frame4),
};
void PetalburgGymSpecial1(void)
void PetalburgGymSlideOpenRoomDoors(void)
{
sUnknown_0203AB5C = 0;
sPetalburgGymSlidingDoorFrameCounter = 0;
sSlidingDoorNextFrameCounter = 0;
sSlidingDoorFrame = 0;
PlaySE(SE_KI_GASYAN);
CreateTask(Task_PetalburgGym, 8);
CreateTask(Task_PetalburgGymSlideOpenRoomDoors, 8);
}
static void Task_PetalburgGym(u8 taskId)
static void Task_PetalburgGymSlideOpenRoomDoors(u8 taskId)
{
if (gUnknown_085B2B78[sPetalburgGymSlidingDoorFrameCounter] == sUnknown_0203AB5C)
if (sSlidingDoorNextFrameDelay[sSlidingDoorFrame] == sSlidingDoorNextFrameCounter)
{
PetalburgGymFunc(gSpecialVar_0x8004, sPetalburgGymSlidingDoorMetatiles[sPetalburgGymSlidingDoorFrameCounter]);
sUnknown_0203AB5C = 0;
if ((++sPetalburgGymSlidingDoorFrameCounter) == ARRAY_COUNT(sPetalburgGymSlidingDoorMetatiles))
PetalburgGymSetDoorMetatiles(gSpecialVar_0x8004, sPetalburgGymSlidingDoorMetatiles[sSlidingDoorFrame]);
sSlidingDoorNextFrameCounter = 0;
if ((++sSlidingDoorFrame) == ARRAY_COUNT(sPetalburgGymSlidingDoorMetatiles))
{
DestroyTask(taskId);
EnableBothScriptContexts();
@@ -846,11 +846,11 @@ static void Task_PetalburgGym(u8 taskId)
}
else
{
sUnknown_0203AB5C++;
sSlidingDoorNextFrameCounter++;
}
}
static void PetalburgGymFunc(u8 roomNumber, u16 metatileId)
static void PetalburgGymSetDoorMetatiles(u8 roomNumber, u16 metatileId)
{
u16 doorCoordsX[4];
u16 doorCoordsY[4];
@@ -915,9 +915,9 @@ static void PetalburgGymFunc(u8 roomNumber, u16 metatileId)
DrawWholeMapView();
}
void PetalburgGymSpecial2(void)
void PetalburgGymUnlockRoomDoors(void)
{
PetalburgGymFunc(gSpecialVar_0x8004, sPetalburgGymSlidingDoorMetatiles[4]);
PetalburgGymSetDoorMetatiles(gSpecialVar_0x8004, sPetalburgGymSlidingDoorMetatiles[4]);
}
void ShowFieldMessageStringVar4(void)

17
src/field_tasks.c
View File

@@ -16,6 +16,7 @@
#include "secret_base.h"
#include "sound.h"
#include "task.h"
#include "constants/field_tasks.h"
#include "constants/items.h"
#include "constants/songs.h"
#include "constants/vars.h"
@@ -38,14 +39,14 @@ static void Task_MuddySlope(u8 taskId);
static const TaskFunc sPerStepCallbacks[] =
{
DummyPerStepCallback,
AshGrassPerStepCallback,
FortreeBridgePerStepCallback,
PacifidlogBridgePerStepCallback,
SootopolisGymIcePerStepCallback,
EndTruckSequence,
SecretBasePerStepCallback,
CrackedFloorPerStepCallback
[STEP_CB_DUMMY] = DummyPerStepCallback,
[STEP_CB_ASH] = AshGrassPerStepCallback,
[STEP_CB_FORTREE_BRIDGE] = FortreeBridgePerStepCallback,
[STEP_CB_PACIFIDLOG_BRIDGE] = PacifidlogBridgePerStepCallback,
[STEP_CB_SOOTOPOLIS_ICE] = SootopolisGymIcePerStepCallback,
[STEP_CB_TRUCK] = EndTruckSequence,
[STEP_CB_SECRET_BASE] = SecretBasePerStepCallback,
[STEP_CB_CRACKED_FLOOR] = CrackedFloorPerStepCallback
};
// they are in pairs but declared as 1D array

80
src/mossdeep_gym.c
View File

@@ -12,10 +12,10 @@ extern const u8 gUnknown_08612698[];
extern const u8 gUnknown_0861269C[];
extern const u8 gUnknown_086126A0[];
extern const u8 gUnknown_086126A4[];
extern const u8 gUnknown_086126A8[];
extern const u8 gUnknown_086126AA[];
extern const u8 gUnknown_086126AC[];
extern const u8 gUnknown_086126AE[];
extern const u8 MossdeepGym_Movement_FaceRight[];
extern const u8 MossdeepGym_Movement_FaceDown[];
extern const u8 MossdeepGym_Movement_FaceLeft[];
extern const u8 MossdeepGym_Movement_FaceUp[];
struct MossdeepSubStruct
{
@@ -35,23 +35,23 @@ static void AddEventObject(u8 eventTemplateId, u8 arg1);
static void sub_81A8D94(u8 eventTemplateId, u8 arg1);
// EWRAM vars
EWRAM_DATA static struct MossdeepStruct *gUnknown_0203CE50 = NULL;
EWRAM_DATA static struct MossdeepStruct *sMossdeepGym = NULL;
// code
void InitMossdeepGymTiles(bool8 arg0)
{
if (gUnknown_0203CE50 == NULL)
gUnknown_0203CE50 = AllocZeroed(sizeof(*gUnknown_0203CE50));
if (sMossdeepGym == NULL)
sMossdeepGym = AllocZeroed(sizeof(*sMossdeepGym));
gUnknown_0203CE50->unk41 = arg0;
sMossdeepGym->unk41 = arg0;
}
void FinishMossdeepGymTiles(void)
{
u8 id;
if (gUnknown_0203CE50 != NULL)
FREE_AND_SET_NULL(gUnknown_0203CE50);
if (sMossdeepGym != NULL)
FREE_AND_SET_NULL(sMossdeepGym);
id = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
EventObjectClearHeldMovementIfFinished(&gEventObjects[id]);
@@ -72,7 +72,7 @@ u16 MossdeepGym_MoveEvents(u8 arg0)
s16 y = events[i].y + 7;
u16 metatile = MapGridGetMetatileIdAt(x, y);
if (!gUnknown_0203CE50->unk41)
if (!sMossdeepGym->unk41)
var = 0x250;
else
var = 0x298;
@@ -138,26 +138,26 @@ void MossdeepGym_TurnEvents(void)
s32 var;
struct EventObjectTemplate *events;
if (gUnknown_0203CE50 == NULL)
if (sMossdeepGym == NULL)
return;
if (!gUnknown_0203CE50->unk41)
if (!sMossdeepGym->unk41)
var = 0x250;
else
var = 0x298;
events = gSaveBlock1Ptr->eventObjectTemplates;
for (i = 0; i < gUnknown_0203CE50->count; i++)
for (i = 0; i < sMossdeepGym->count; i++)
{
s32 r6;
s8 r0;
u8 eventObjectId;
s16 x = events[gUnknown_0203CE50->objects[i].eventTemplateId].x + 7;
s16 y = events[gUnknown_0203CE50->objects[i].eventTemplateId].y + 7;
s16 x = events[sMossdeepGym->objects[i].eventTemplateId].x + 7;
s16 y = events[sMossdeepGym->objects[i].eventTemplateId].y + 7;
u16 metatile = MapGridGetMetatileIdAt(x, y);
r0 = (u8)((metatile - var) % 8);
r0 -= (gUnknown_0203CE50->objects[i].unk0);
r0 -= (sMossdeepGym->objects[i].unk0);
if (r0 < 0 || r0 == 3)
{
if (r0 == -3)
@@ -173,7 +173,7 @@ void MossdeepGym_TurnEvents(void)
r6 = 2;
}
eventObjectId = GetEventObjectIdByLocalIdAndMap(events[gUnknown_0203CE50->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
eventObjectId = GetEventObjectIdByLocalIdAndMap(events[sMossdeepGym->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
if (eventObjectId != EVENT_OBJECTS_COUNT)
{
const u8 *movementScript;
@@ -183,25 +183,25 @@ void MossdeepGym_TurnEvents(void)
switch (direction)
{
case DIR_EAST:
movementScript = gUnknown_086126AE;
events[gUnknown_0203CE50->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP;
movementScript = MossdeepGym_Movement_FaceUp;
events[sMossdeepGym->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP;
break;
case DIR_SOUTH:
movementScript = gUnknown_086126A8;
events[gUnknown_0203CE50->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT;
movementScript = MossdeepGym_Movement_FaceRight;
events[sMossdeepGym->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT;
break;
case DIR_WEST:
movementScript = gUnknown_086126AA;
events[gUnknown_0203CE50->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN;
movementScript = MossdeepGym_Movement_FaceDown;
events[sMossdeepGym->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN;
break;
case DIR_NORTH:
movementScript = gUnknown_086126AC;
events[gUnknown_0203CE50->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT;
movementScript = MossdeepGym_Movement_FaceLeft;
events[sMossdeepGym->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT;
break;
default:
continue;
}
ScriptMovement_StartObjectMovementScript(events[gUnknown_0203CE50->objects[i].eventTemplateId].localId,
ScriptMovement_StartObjectMovementScript(events[sMossdeepGym->objects[i].eventTemplateId].localId,
gSaveBlock1Ptr->location.mapNum,
gSaveBlock1Ptr->location.mapGroup,
movementScript);
@@ -211,25 +211,25 @@ void MossdeepGym_TurnEvents(void)
switch (direction)
{
case DIR_EAST:
movementScript = gUnknown_086126AA;
events[gUnknown_0203CE50->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN;
movementScript = MossdeepGym_Movement_FaceDown;
events[sMossdeepGym->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN;
break;
case DIR_SOUTH:
movementScript = gUnknown_086126AC;
events[gUnknown_0203CE50->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT;
movementScript = MossdeepGym_Movement_FaceLeft;
events[sMossdeepGym->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT;
break;
case DIR_WEST:
movementScript = gUnknown_086126AE;
events[gUnknown_0203CE50->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP;
movementScript = MossdeepGym_Movement_FaceUp;
events[sMossdeepGym->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP;
break;
case DIR_NORTH:
movementScript = gUnknown_086126A8;
events[gUnknown_0203CE50->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT;
movementScript = MossdeepGym_Movement_FaceRight;
events[sMossdeepGym->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT;
break;
default:
continue;
}
ScriptMovement_StartObjectMovementScript(events[gUnknown_0203CE50->objects[i].eventTemplateId].localId,
ScriptMovement_StartObjectMovementScript(events[sMossdeepGym->objects[i].eventTemplateId].localId,
gSaveBlock1Ptr->location.mapNum,
gSaveBlock1Ptr->location.mapGroup,
movementScript);
@@ -240,9 +240,9 @@ void MossdeepGym_TurnEvents(void)
static void AddEventObject(u8 eventTemplateId, u8 arg1)
{
gUnknown_0203CE50->objects[gUnknown_0203CE50->count].eventTemplateId = eventTemplateId;
gUnknown_0203CE50->objects[gUnknown_0203CE50->count].unk0 = arg1;
gUnknown_0203CE50->count++;
sMossdeepGym->objects[sMossdeepGym->count].eventTemplateId = eventTemplateId;
sMossdeepGym->objects[sMossdeepGym->count].unk0 = arg1;
sMossdeepGym->count++;
}
static void sub_81A8D94(u8 eventTemplateId, u8 arg1)
@@ -256,7 +256,7 @@ static void sub_81A8D94(u8 eventTemplateId, u8 arg1)
s16 y = events[eventTemplateId].y + 7;
u16 metatile = MapGridGetMetatileIdAt(x, y);
if (!gUnknown_0203CE50->unk41)
if (!sMossdeepGym->unk41)
var = 0x250;
else
var = 0x298;

4
src/overworld.c
View File

@@ -1183,7 +1183,7 @@ void Overworld_ClearSavedMusic(void)
static void sub_8085810(void)
{
if (FlagGet(FLAG_SPECIAL_FLAG_0x4001) != TRUE)
if (FlagGet(FLAG_DONT_TRANSITION_MUSIC) != TRUE)
{
u16 newMusic = GetWarpDestinationMusic();
u16 currentMusic = GetCurrentMapMusic();
@@ -1231,7 +1231,7 @@ void TryFadeOutOldMapMusic(void)
{
u16 currentMusic = GetCurrentMapMusic();
u16 warpMusic = GetWarpDestinationMusic();
if (FlagGet(FLAG_SPECIAL_FLAG_0x4001) != TRUE && warpMusic != GetCurrentMapMusic())
if (FlagGet(FLAG_DONT_TRANSITION_MUSIC) != TRUE && warpMusic != GetCurrentMapMusic())
{
if (currentMusic == MUS_NAMINORI
&& VarGet(VAR_SKY_PILLAR_STATE) == 2