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

Merge pull request #841 from GriffinRichards/document-gyms2

Browse Source 
Document Petalburg, Fortree, Mossdeep, and Sootopolis Gyms
This commit is contained in:
huderlem
2019-10-19 08:05:11 -05:00
committed by GitHub
parent 8b1df92aca b4a9298205
commit cb9f89925f
49 changed files with 1528 additions and 1472 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/event.inc
+14 -11
View File
@@ -1468,31 +1468,34 @@
.byte \location .byte \location
.endm .endm
.macro mossdeepgym1 unknown:req @ For the rotating tile puzzles in Mossdeep Gym/Trick House Room 7. Moves the objects on the colored puzzle specified by puzzleNumber one rotation
.macro moverotatingtileobjects puzzleNumber:req
.byte 0xd3 .byte 0xd3
.2byte \unknown .2byte \puzzleNumber
.endm .endm
.macro mossdeepgym2 @ For the rotating tile puzzles in Mossdeep Gym/Trick House Room 7. Updates the facing direction of all objects on the puzzle tiles
.macro turnrotatingtileobjects
.byte 0xd4 .byte 0xd4
.endm .endm
@ In FireRed, this command is a nop. @ For the rotating tile puzzles in Mossdeep Gym/Trick House Room 7. Allocates memory for the puzzle objects. isTrickHouse is needed to determine which of the two maps the puzzle is on, in order to know where in the tileset the puzzle tiles start. In FireRed, this command is a nop.
.macro mossdeepgym3 var:req .macro initrotatingtilepuzzle isTrickHouse:req
.byte 0xd5 .byte 0xd5
.2byte \var .2byte \isTrickHouse
.endm .endm
.macro mossdeepgym4 @ For the rotating tile puzzles in Mossdeep Gym/Trick House Room 7. Frees the memory allocated for the puzzle objects.
.macro freerotatingtilepuzzle
.byte 0xd6 .byte 0xd6
.endm .endm
.macro warp7 map:req, byte:req, word1:req, word2:req .macro warpmossdeepgym map:req, warpId:req, x:req, y:req
.byte 0xd7 .byte 0xd7
map \map map \map
.byte \byte .byte \warpId
.2byte \word1 .2byte \x
.2byte \word2 .2byte \y
.endm .endm
.macro cmdD8 .macro cmdD8
data/event_scripts.s
+4 -3
View File
@@ -15,6 +15,7 @@
#include "constants/field_effects.h" #include "constants/field_effects.h"
#include "constants/field_poison.h" #include "constants/field_poison.h"
#include "constants/field_specials.h" #include "constants/field_specials.h"
#include "constants/field_tasks.h"
#include "constants/flags.h" #include "constants/flags.h"
#include "constants/game_stat.h" #include "constants/game_stat.h"
#include "constants/item.h" #include "constants/item.h"
@@ -1250,12 +1251,12 @@ EventScript_RegionMap:: @ 827208F
end end
Common_EventScript_PlayBrineysBoatMusic:: @ 82720A0 Common_EventScript_PlayBrineysBoatMusic:: @ 82720A0
setflag FLAG_SPECIAL_FLAG_0x4001 setflag FLAG_DONT_TRANSITION_MUSIC
playbgm MUS_M_BOAT, 0 playbgm MUS_M_BOAT, 0
return return
Common_EventScript_StopBrineysBoatMusic:: @ 82720A8 Common_EventScript_StopBrineysBoatMusic:: @ 82720A8
clearflag FLAG_SPECIAL_FLAG_0x4001 clearflag FLAG_DONT_TRANSITION_MUSIC
fadedefaultbgm fadedefaultbgm
return return
@@ -1277,7 +1278,7 @@ Movement_FerryDepart: @ 82721F0
walk_right walk_right
step_end step_end
PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8 EventScript_HideMrBriney:: @ 82721F8
setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
setflag FLAG_HIDE_ROUTE_108_MR_BRINEY setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
data/maps/FortreeCity/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ FortreeCity_OnTransition: @ 81E25AF
end end
FortreeCity_MapScript1_1E25B3: @ 81E25B3 FortreeCity_MapScript1_1E25B3: @ 81E25B3
setstepcallback 2 setstepcallback STEP_CB_FORTREE_BRIDGE
end end
FortreeCity_EventScript_1E25B6:: @ 81E25B6 FortreeCity_EventScript_1E25B6:: @ 81E25B6
data/maps/FortreeCity_Gym/map.json
+10 -10
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FortreeCity_Gym_EventScript_2165C8", "script": "FortreeCity_Gym_EventScript_Winona",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3", "trainer_sight_or_berry_tree_id": "3",
"script": "FortreeCity_Gym_EventScript_2166A8", "script": "FortreeCity_Gym_EventScript_Jared",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2", "trainer_sight_or_berry_tree_id": "2",
"script": "FortreeCity_Gym_EventScript_2166D6", "script": "FortreeCity_Gym_EventScript_Flint",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "FortreeCity_Gym_EventScript_2166ED", "script": "FortreeCity_Gym_EventScript_Ashley",
"flag": "0" "flag": "0"
}, },
{ {
@@ -76,7 +76,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2", "trainer_sight_or_berry_tree_id": "2",
"script": "FortreeCity_Gym_EventScript_2166BF", "script": "FortreeCity_Gym_EventScript_Edwardo",
"flag": "0" "flag": "0"
}, },
{ {
@@ -89,7 +89,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FortreeCity_Gym_EventScript_216732", "script": "FortreeCity_Gym_EventScript_GymGuide",
"flag": "0" "flag": "0"
}, },
{ {
@@ -102,7 +102,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "FortreeCity_Gym_EventScript_216704", "script": "FortreeCity_Gym_EventScript_Humberto",
"flag": "0" "flag": "0"
}, },
{ {
@@ -115,7 +115,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3", "trainer_sight_or_berry_tree_id": "3",
"script": "FortreeCity_Gym_EventScript_21671B", "script": "FortreeCity_Gym_EventScript_Darius",
"flag": "0" "flag": "0"
} }
], ],
@@ -143,7 +143,7 @@
"y": 21, "y": 21,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "FortreeCity_Gym_EventScript_216751" "script": "FortreeCity_Gym_EventScript_LeftGymStatue"
}, },
{ {
"type": "sign", "type": "sign",
@@ -151,7 +151,7 @@
"y": 21, "y": 21,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "FortreeCity_Gym_EventScript_216761" "script": "FortreeCity_Gym_EventScript_RightGymStatue"
} }
] ]
} }
data/maps/FortreeCity_Gym/scripts.inc
+88 -88
View File
@@ -1,44 +1,44 @@
FortreeCity_Gym_MapScripts:: @ 82165AB FortreeCity_Gym_MapScripts:: @ 82165AB
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_OnTransition 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 .byte 0
FortreeCity_Gym_OnTransition: @ 82165B6 FortreeCity_Gym_OnTransition: @ 82165B6
special RotatingGate_InitPuzzle special RotatingGate_InitPuzzle
end end
FortreeCity_Gym_MapScript2_2165BA: @ 82165BA FortreeCity_Gym_OnWarp: @ 82165BA
map_script_2 VAR_TEMP_0, 16384, FortreeCity_Gym_EventScript_2165C4 map_script_2 VAR_TEMP_0, VAR_TEMP_0, FortreeCity_Gym_EventScript_InitRotatingGates
.2byte 0 .2byte 0
FortreeCity_Gym_EventScript_2165C4:: @ 82165C4 FortreeCity_Gym_EventScript_InitRotatingGates:: @ 82165C4
special RotatingGate_InitPuzzleAndGraphics special RotatingGate_InitPuzzleAndGraphics
end end
FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 FortreeCity_Gym_EventScript_Winona:: @ 82165C8
trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD, NO_MUSIC trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_WinonaPreBattle, FortreeCity_Gym_Text_WinonaDefeat, FortreeCity_Gym_EventScript_WinonaDefeated, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq FortreeCity_Gym_EventScript_21668D goto_if_eq FortreeCity_Gym_EventScript_WinonaRematch
goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_216646 goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_GiveAerialAce2
msgbox FortreeCity_Gym_Text_217071, MSGBOX_DEFAULT msgbox FortreeCity_Gym_Text_WinonaPostBattle, MSGBOX_DEFAULT
release release
end end
FortreeCity_Gym_EventScript_2165FD:: @ 82165FD FortreeCity_Gym_EventScript_WinonaDefeated:: @ 82165FD
message FortreeCity_Gym_Text_216EEC message FortreeCity_Gym_Text_ReceivedFeatherBadge
waitmessage waitmessage
call Common_EventScript_PlayGymBadgeFanfare 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_DEFEATED_FORTREE_GYM
setflag FLAG_BADGE06_GET setflag FLAG_BADGE06_GET
setvar VAR_0x8008, 6 setvar VAR_0x8008, 6
call Common_EventScript_SetGymTrainers call Common_EventScript_SetGymTrainers
call FortreeCity_Gym_EventScript_21666A call FortreeCity_Gym_EventScript_GiveAerialAce
closemessage closemessage
delay 30 delay 30
playfanfare MUS_ME_TORE_EYE playfanfare MUS_ME_TORE_EYE
msgbox FortreeCity_Gym_Text_217044, MSGBOX_DEFAULT msgbox FortreeCity_Gym_Text_RegisteredWinona, MSGBOX_DEFAULT
waitfanfare waitfanfare
closemessage closemessage
delay 30 delay 30
@@ -48,94 +48,94 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD
release release
end end
FortreeCity_Gym_EventScript_216646:: @ 8216646 FortreeCity_Gym_EventScript_GiveAerialAce2:: @ 8216646
giveitem_std ITEM_TM40 giveitem_std ITEM_TM40
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull goto_if_eq Common_EventScript_ShowBagIsFull
msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_TM40 setflag FLAG_RECEIVED_TM40
release release
end end
FortreeCity_Gym_EventScript_21666A:: @ 821666A FortreeCity_Gym_EventScript_GiveAerialAce:: @ 821666A
giveitem_std ITEM_TM40 giveitem_std ITEM_TM40
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Common_EventScript_BagIsFull goto_if_eq Common_EventScript_BagIsFull
msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_TM40 setflag FLAG_RECEIVED_TM40
return return
FortreeCity_Gym_EventScript_21668D:: @ 821668D FortreeCity_Gym_EventScript_WinonaRematch:: @ 821668D
trainerbattle_rematch_double TRAINER_WINONA_1, FortreeCity_Gym_Text_217100, FortreeCity_Gym_Text_2171E6, FortreeCity_Gym_Text_217292 trainerbattle_rematch_double TRAINER_WINONA_1, FortreeCity_Gym_Text_WinonaPreRematch, FortreeCity_Gym_Text_WinonaRematchDefeat, FortreeCity_Gym_Text_WinonaRematchNeedTwoMons
msgbox FortreeCity_Gym_Text_21720B, MSGBOX_AUTOCLOSE msgbox FortreeCity_Gym_Text_WinonaPostRematch, MSGBOX_AUTOCLOSE
end end
FortreeCity_Gym_EventScript_2166A8:: @ 82166A8 FortreeCity_Gym_EventScript_Jared:: @ 82166A8
trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3 trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_JaredPreBattle, FortreeCity_Gym_Text_JaredDefeat
msgbox FortreeCity_Gym_Text_2168E7, MSGBOX_AUTOCLOSE msgbox FortreeCity_Gym_Text_JaredPostBattle, MSGBOX_AUTOCLOSE
end end
FortreeCity_Gym_EventScript_2166BF:: @ 82166BF FortreeCity_Gym_EventScript_Edwardo:: @ 82166BF
trainerbattle_single TRAINER_EDWARDO, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7 trainerbattle_single TRAINER_EDWARDO, FortreeCity_Gym_Text_EdwardoPreBattle, FortreeCity_Gym_Text_EdwardoDefeat
msgbox FortreeCity_Gym_Text_2169F1, MSGBOX_AUTOCLOSE msgbox FortreeCity_Gym_Text_EdwardoPostBattle, MSGBOX_AUTOCLOSE
end end
FortreeCity_Gym_EventScript_2166D6:: @ 82166D6 FortreeCity_Gym_EventScript_Flint:: @ 82166D6
trainerbattle_single TRAINER_FLINT, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4 trainerbattle_single TRAINER_FLINT, FortreeCity_Gym_Text_FlintPreBattle, FortreeCity_Gym_Text_FlintDefeat
msgbox FortreeCity_Gym_Text_216AD7, MSGBOX_AUTOCLOSE msgbox FortreeCity_Gym_Text_FlintPostBattle, MSGBOX_AUTOCLOSE
end end
FortreeCity_Gym_EventScript_2166ED:: @ 82166ED FortreeCity_Gym_EventScript_Ashley:: @ 82166ED
trainerbattle_single TRAINER_ASHLEY, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51 trainerbattle_single TRAINER_ASHLEY, FortreeCity_Gym_Text_AshleyPreBattle, FortreeCity_Gym_Text_AshleyDefeat
msgbox FortreeCity_Gym_Text_216B5F, MSGBOX_AUTOCLOSE msgbox FortreeCity_Gym_Text_AshleyPostBattle, MSGBOX_AUTOCLOSE
end end
FortreeCity_Gym_EventScript_216704:: @ 8216704 FortreeCity_Gym_EventScript_Humberto:: @ 8216704
trainerbattle_single TRAINER_HUMBERTO, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18 trainerbattle_single TRAINER_HUMBERTO, FortreeCity_Gym_Text_HumbertoPreBattle, FortreeCity_Gym_Text_HumbertoDefeat
msgbox FortreeCity_Gym_Text_216C32, MSGBOX_AUTOCLOSE msgbox FortreeCity_Gym_Text_HumbertoPostBattle, MSGBOX_AUTOCLOSE
end end
FortreeCity_Gym_EventScript_21671B:: @ 821671B FortreeCity_Gym_EventScript_Darius:: @ 821671B
trainerbattle_single TRAINER_DARIUS, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2 trainerbattle_single TRAINER_DARIUS, FortreeCity_Gym_Text_DariusPreBattle, FortreeCity_Gym_Text_DariusDefeat
msgbox FortreeCity_Gym_Text_216D0F, MSGBOX_AUTOCLOSE msgbox FortreeCity_Gym_Text_DariusPostBattle, MSGBOX_AUTOCLOSE
end end
FortreeCity_Gym_EventScript_216732:: @ 8216732 FortreeCity_Gym_EventScript_GymGuide:: @ 8216732
lock lock
faceplayer faceplayer
goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_216747 goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_GymGuidePostVictory
msgbox FortreeCity_Gym_Text_216785, MSGBOX_DEFAULT msgbox FortreeCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT
release release
end end
FortreeCity_Gym_EventScript_216747:: @ 8216747 FortreeCity_Gym_EventScript_GymGuidePostVictory:: @ 8216747
msgbox FortreeCity_Gym_Text_21687D, MSGBOX_DEFAULT msgbox FortreeCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT
release release
end end
FortreeCity_Gym_EventScript_216751:: @ 8216751 FortreeCity_Gym_EventScript_LeftGymStatue:: @ 8216751
lockall lockall
goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_216771 goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_GymStatueCertified
goto FortreeCity_Gym_EventScript_21677B goto FortreeCity_Gym_EventScript_GymStatue
end end
FortreeCity_Gym_EventScript_216761:: @ 8216761 FortreeCity_Gym_EventScript_RightGymStatue:: @ 8216761
lockall lockall
goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_216771 goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_GymStatueCertified
goto FortreeCity_Gym_EventScript_21677B goto FortreeCity_Gym_EventScript_GymStatue
end end
FortreeCity_Gym_EventScript_216771:: @ 8216771 FortreeCity_Gym_EventScript_GymStatueCertified:: @ 8216771
msgbox FortreeCity_Gym_Text_2170C7, MSGBOX_DEFAULT msgbox FortreeCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT
releaseall releaseall
end end
FortreeCity_Gym_EventScript_21677B:: @ 821677B FortreeCity_Gym_EventScript_GymStatue:: @ 821677B
msgbox FortreeCity_Gym_Text_2170AE, MSGBOX_DEFAULT msgbox FortreeCity_Gym_Text_GymStatue, MSGBOX_DEFAULT
releaseall releaseall
end end
FortreeCity_Gym_Text_216785: @ 8216785 FortreeCity_Gym_Text_GymGuideAdvice: @ 8216785
.string "Yo, how's it going, CHAMPION-\n" .string "Yo, how's it going, CHAMPION-\n"
.string "bound {PLAYER}?\p" .string "bound {PLAYER}?\p"
.string "FORTREE GYM LEADER WINONA is\n" .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 "who are trying to take wing!\p"
.string "Okay, go for it!$" .string "Okay, go for it!$"
FortreeCity_Gym_Text_21687D: @ 821687D FortreeCity_Gym_Text_GymGuidePostVictory: @ 821687D
.string "You did it!\n" .string "You did it!\n"
.string "You've achieved liftoff!$" .string "You've achieved liftoff!$"
FortreeCity_Gym_Text_2168A2: @ 82168A2 FortreeCity_Gym_Text_JaredPreBattle: @ 82168A2
.string "Behold the elegant battle style of\n" .string "Behold the elegant battle style of\n"
.string "BIRD POKéMON!$" .string "BIRD POKéMON!$"
FortreeCity_Gym_Text_2168D3: @ 82168D3 FortreeCity_Gym_Text_JaredDefeat: @ 82168D3
.string "You…\n" .string "You…\n"
.string "You're strong…$" .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 "A TRAINER has to be smart to keep\n"
.string "up with unexpected turns of events.\p" .string "up with unexpected turns of events.\p"
.string "Do you have the smarts to get to\n" .string "Do you have the smarts to get to\n"
.string "our LEADER?$" .string "our LEADER?$"
FortreeCity_Gym_Text_21695A: @ 821695A FortreeCity_Gym_Text_EdwardoPreBattle: @ 821695A
.string "The lovers of BIRD POKéMON aspire\n" .string "The lovers of BIRD POKéMON aspire\n"
.string "to join this GYM.\p" .string "to join this GYM.\p"
.string "As a member of the FORTREE GYM,\n" .string "As a member of the FORTREE GYM,\n"
.string "I'm not allowed to lose!$" .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 "It was too much of a load for me\n"
.string "to bear…$" .string "to bear…$"
FortreeCity_Gym_Text_2169F1: @ 82169F1 FortreeCity_Gym_Text_EdwardoPostBattle: @ 82169F1
.string "The world is huge, and there are\n" .string "The world is huge, and there are\n"
.string "countless tough TRAINERS.\p" .string "countless tough TRAINERS.\p"
.string "I'm going to keep training and make\n" .string "I'm going to keep training and make\n"
.string "myself even stronger.$" .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 "There's no need for WINONA, our GYM\n"
.string "LEADER, to deal with you!\p" .string "LEADER, to deal with you!\p"
.string "I'm plenty good enough for you!$" .string "I'm plenty good enough for you!$"
FortreeCity_Gym_Text_216AC4: @ 8216AC4 FortreeCity_Gym_Text_FlintDefeat: @ 8216AC4
.string "WINONA, I…\n" .string "WINONA, I…\n"
.string "I lost!$" .string "I lost!$"
FortreeCity_Gym_Text_216AD7: @ 8216AD7 FortreeCity_Gym_Text_FlintPostBattle: @ 8216AD7
.string "WINONA is cute and she's strong.\n" .string "WINONA is cute and she's strong.\n"
.string "She's the ultimate LEADER!\p" .string "She's the ultimate LEADER!\p"
.string "Blush…$" .string "Blush…$"
FortreeCity_Gym_Text_216B1A: @ 8216B1A FortreeCity_Gym_Text_AshleyPreBattle: @ 8216B1A
.string "WINONA taught me personally!\n" .string "WINONA taught me personally!\n"
.string "You can't beat me easily!$" .string "You can't beat me easily!$"
FortreeCity_Gym_Text_216B51: @ 8216B51 FortreeCity_Gym_Text_AshleyDefeat: @ 8216B51
.string "I was beaten…$" .string "I was beaten…$"
FortreeCity_Gym_Text_216B5F: @ 8216B5F FortreeCity_Gym_Text_AshleyPostBattle: @ 8216B5F
.string "Thanks to WINONA, the people of\n" .string "Thanks to WINONA, the people of\n"
.string "FORTREE can live without fear.$" .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 "When WINONA takes to battle, her face\n"
.string "shines with beautiful determination…\p" .string "shines with beautiful determination…\p"
.string "I'm not letting you witness that\n" .string "I'm not letting you witness that\n"
.string "lovely sight!$" .string "lovely sight!$"
FortreeCity_Gym_Text_216C18: @ 8216C18 FortreeCity_Gym_Text_HumbertoDefeat: @ 8216C18
.string "Urk!\n" .string "Urk!\n"
.string "I couldn't stop you.$" .string "I couldn't stop you.$"
FortreeCity_Gym_Text_216C32: @ 8216C32 FortreeCity_Gym_Text_HumbertoPostBattle: @ 8216C32
.string "You'd better watch it!\n" .string "You'd better watch it!\n"
.string "Don't get distracted staring at WINONA\l" .string "Don't get distracted staring at WINONA\l"
.string "or you'll go crashing down in a heap!$" .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 "You'd better know that there are all\n"
.string "sorts of FLYING-type POKéMON.\p" .string "sorts of FLYING-type POKéMON.\p"
.string "You do know that, right?$" .string "You do know that, right?$"
FortreeCity_Gym_Text_216CF2: @ 8216CF2 FortreeCity_Gym_Text_DariusDefeat: @ 8216CF2
.string "You seem to know your stuff!$" .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 "Sure, you beat me all right.\n"
.string "But you'd better watch it! Our LEADER\l" .string "But you'd better watch it! Our LEADER\l"
.string "WINONA's POKéMON are all business.$" .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 "I am WINONA. I am the LEADER of\n"
.string "the FORTREE POKéMON GYM.\p" .string "the FORTREE POKéMON GYM.\p"
.string "I have become one with BIRD POKéMON\n" .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 "Witness the elegant choreography\n"
.string "of BIRD POKéMON and I!$" .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 "Never before have I seen a TRAINER\n"
.string "command POKéMON with more grace\l" .string "command POKéMON with more grace\l"
.string "than I…\p" .string "than I…\p"
.string "In recognition of your prowess,\n" .string "In recognition of your prowess,\n"
.string "I present to you this GYM BADGE.$" .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 "{PLAYER} received the FEATHER BADGE\n"
.string "from WINONA.$" .string "from WINONA.$"
FortreeCity_Gym_Text_216F17: @ 8216F17 FortreeCity_Gym_Text_ExplainFeatherBadgeTakeThis: @ 8216F17
.string "With the FEATHER BADGE, all POKéMON up\n" .string "With the FEATHER BADGE, all POKéMON up\n"
.string "to LV 70, even those received through\l" .string "to LV 70, even those received through\l"
.string "trades, will obey your every command.\p" .string "trades, will obey your every command.\p"
@@ -263,29 +263,29 @@ FortreeCity_Gym_Text_216F17: @ 8216F17
.string "And this…\n" .string "And this…\n"
.string "This is a gift from me.$" .string "This is a gift from me.$"
FortreeCity_Gym_Text_216FEC: @ 8216FEC FortreeCity_Gym_Text_ExplainAerialAce: @ 8216FEC
.string "TM40 contains AERIAL ACE.\p" .string "TM40 contains AERIAL ACE.\p"
.string "Its speed…\n" .string "Its speed…\n"
.string "No POKéMON should be able to avoid it.\p" .string "No POKéMON should be able to avoid it.\p"
.string "… … … … … …$" .string "… … … … … …$"
FortreeCity_Gym_Text_217044: @ 8217044 FortreeCity_Gym_Text_RegisteredWinona: @ 8217044
.string "Registered GYM LEADER WINONA\n" .string "Registered GYM LEADER WINONA\n"
.string "in the POKéNAV.$" .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 "Though I fell to you, I will remain\n"
.string "devoted to BIRD POKéMON.$" .string "devoted to BIRD POKéMON.$"
FortreeCity_Gym_Text_2170AE: @ 82170AE FortreeCity_Gym_Text_GymStatue: @ 82170AE
.string "FORTREE CITY POKéMON GYM$" .string "FORTREE CITY POKéMON GYM$"
FortreeCity_Gym_Text_2170C7: @ 82170C7 FortreeCity_Gym_Text_GymStatueCertified: @ 82170C7
.string "FORTREE CITY POKéMON GYM\p" .string "FORTREE CITY POKéMON GYM\p"
.string "WINONA'S CERTIFIED TRAINERS:\n" .string "WINONA'S CERTIFIED TRAINERS:\n"
.string "{PLAYER}$" .string "{PLAYER}$"
FortreeCity_Gym_Text_217100: @ 8217100 FortreeCity_Gym_Text_WinonaPreRematch: @ 8217100
.string "WINONA: We humans can never escape\n" .string "WINONA: We humans can never escape\n"
.string "gravity's pull on the ground.\p" .string "gravity's pull on the ground.\p"
.string "But by striving for excellence,\n" .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 "Please, allow me to see your power\n"
.string "at full flight!$" .string "at full flight!$"
FortreeCity_Gym_Text_2171E6: @ 82171E6 FortreeCity_Gym_Text_WinonaRematchDefeat: @ 82171E6
.string "I failed to reach your height again…$" .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 "WINONA: Even though I have lost,\n"
.string "the wings of my heart remain unbroken.\p" .string "the wings of my heart remain unbroken.\p"
.string "I can rise and soar again and\n" .string "I can rise and soar again and\n"
.string "yet again.\p" .string "yet again.\p"
.string "I am convinced of it!$" .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 "WINONA: We humans can never escape\n"
.string "gravity's pull on the ground.\p" .string "gravity's pull on the ground.\p"
.string "But by striving for excellence,\n" .string "But by striving for excellence,\n"
data/maps/GraniteCave_B1F/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ GraniteCave_B1F_MapScripts:: @ 822DC5E
.byte 0 .byte 0
GraniteCave_B1F_SetHoleWarp: @ 822DC6E GraniteCave_B1F_SetHoleWarp: @ 822DC6E
setstepcallback 7 setstepcallback STEP_CB_CRACKED_FLOOR
setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0
end end
data/maps/InsideOfTruck/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ InsideOfTruck_MapScript1_23BEE5: @ 823BEE5
end end
InsideOfTruck_MapScript1_23BF01: @ 823BF01 InsideOfTruck_MapScript1_23BF01: @ 823BF01
setstepcallback 5 setstepcallback STEP_CB_TRUCK
end end
InsideOfTruck_EventScript_23BF04:: @ 823BF04 InsideOfTruck_EventScript_23BF04:: @ 823BF04
data/maps/JaggedPass/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ JaggedPass_MapScripts:: @ 8230656
.byte 0 .byte 0
JaggedPass_MapScript1_230666: @ 8230666 JaggedPass_MapScript1_230666: @ 8230666
setstepcallback 1 setstepcallback STEP_CB_ASH
compare VAR_JAGGED_PASS_STATE, 0 compare VAR_JAGGED_PASS_STATE, 0
call_if_eq JaggedPass_EventScript_230674 call_if_eq JaggedPass_EventScript_230674
end end
data/maps/MirageTower_2F/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ MirageTower_2F_MapScripts:: @ 823AD11
.byte 0 .byte 0
MirageTower_2F_SetHoleWarp: @ 823AD21 MirageTower_2F_SetHoleWarp: @ 823AD21
setstepcallback 7 setstepcallback STEP_CB_CRACKED_FLOOR
setholewarp MAP_MIRAGE_TOWER_1F, 255, 0, 0 setholewarp MAP_MIRAGE_TOWER_1F, 255, 0, 0
end end
data/maps/MirageTower_3F/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ MirageTower_3F_MapScripts:: @ 823AD2C
.byte 0 .byte 0
MirageTower_3F_SetHoleWarp: @ 823AD3C MirageTower_3F_SetHoleWarp: @ 823AD3C
setstepcallback 7 setstepcallback STEP_CB_CRACKED_FLOOR
setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0 setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0
end end
data/maps/MossdeepCity_Gym/map.json
+26 -26
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_Gym_EventScript_220898", "script": "MossdeepCity_Gym_EventScript_TateAndLiza",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220AFD", "script": "MossdeepCity_Gym_EventScript_Preston",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220B2B", "script": "MossdeepCity_Gym_EventScript_Blake",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220B70", "script": "MossdeepCity_Gym_EventScript_Maura",
"flag": "0" "flag": "0"
}, },
{ {
@@ -76,7 +76,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220B59", "script": "MossdeepCity_Gym_EventScript_Samantha",
"flag": "0" "flag": "0"
}, },
{ {
@@ -89,7 +89,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220B14", "script": "MossdeepCity_Gym_EventScript_Virgil",
"flag": "0" "flag": "0"
}, },
{ {
@@ -102,7 +102,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220B42", "script": "MossdeepCity_Gym_EventScript_Hannah",
"flag": "0" "flag": "0"
}, },
{ {
@@ -115,7 +115,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_Gym_EventScript_220C11", "script": "MossdeepCity_Gym_EventScript_GymGuide",
"flag": "0" "flag": "0"
}, },
{ {
@@ -128,7 +128,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_Gym_EventScript_220898", "script": "MossdeepCity_Gym_EventScript_TateAndLiza",
"flag": "0" "flag": "0"
}, },
{ {
@@ -232,7 +232,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220B9E", "script": "MossdeepCity_Gym_EventScript_Nate",
"flag": "0" "flag": "0"
}, },
{ {
@@ -245,7 +245,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220B87", "script": "MossdeepCity_Gym_EventScript_Sylvia",
"flag": "0" "flag": "0"
}, },
{ {
@@ -336,7 +336,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220BCC", "script": "MossdeepCity_Gym_EventScript_Clifford",
"flag": "0" "flag": "0"
}, },
{ {
@@ -362,7 +362,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220BB5", "script": "MossdeepCity_Gym_EventScript_Macey",
"flag": "0" "flag": "0"
}, },
{ {
@@ -375,7 +375,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220BFA", "script": "MossdeepCity_Gym_EventScript_Kathleen",
"flag": "0" "flag": "0"
}, },
{ {
@@ -427,7 +427,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "MossdeepCity_Gym_EventScript_220BE3", "script": "MossdeepCity_Gym_EventScript_Nicholas",
"flag": "0" "flag": "0"
}, },
{ {
@@ -591,7 +591,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_1", "var": "VAR_TEMP_1",
"var_value": "0", "var_value": "0",
"script": "MossdeepCity_Gym_EventScript_220C67" "script": "MossdeepCity_Gym_EventScript_YellowFloorSwitch"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -600,7 +600,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_1", "var": "VAR_TEMP_1",
"var_value": "0", "var_value": "0",
"script": "MossdeepCity_Gym_EventScript_220C7D" "script": "MossdeepCity_Gym_EventScript_BlueFloorSwitch"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -609,7 +609,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_1", "var": "VAR_TEMP_1",
"var_value": "0", "var_value": "0",
"script": "MossdeepCity_Gym_EventScript_220C7D" "script": "MossdeepCity_Gym_EventScript_BlueFloorSwitch"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -618,7 +618,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_1", "var": "VAR_TEMP_1",
"var_value": "0", "var_value": "0",
"script": "MossdeepCity_Gym_EventScript_220C93" "script": "MossdeepCity_Gym_EventScript_GreenFloorSwitch"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -627,7 +627,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_1", "var": "VAR_TEMP_1",
"var_value": "0", "var_value": "0",
"script": "MossdeepCity_Gym_EventScript_220CA9" "script": "MossdeepCity_Gym_EventScript_PurpleFloorSwitch"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -636,7 +636,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_1", "var": "VAR_TEMP_1",
"var_value": "0", "var_value": "0",
"script": "MossdeepCity_Gym_EventScript_220CA9" "script": "MossdeepCity_Gym_EventScript_PurpleFloorSwitch"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -645,7 +645,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_1", "var": "VAR_TEMP_1",
"var_value": "0", "var_value": "0",
"script": "MossdeepCity_Gym_EventScript_220CBF" "script": "MossdeepCity_Gym_EventScript_RedFloorSwitch"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -654,7 +654,7 @@
"elevation": 0, "elevation": 0,
"var": "VAR_TEMP_1", "var": "VAR_TEMP_1",
"var_value": "0", "var_value": "0",
"script": "MossdeepCity_Gym_EventScript_220AF1" "script": "MossdeepCity_Gym_EventScript_WarpToEntrance"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -663,7 +663,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_1", "var": "VAR_TEMP_1",
"var_value": "0", "var_value": "0",
"script": "MossdeepCity_Gym_EventScript_220C67" "script": "MossdeepCity_Gym_EventScript_YellowFloorSwitch"
} }
], ],
"bg_events": [ "bg_events": [
@@ -673,7 +673,7 @@
"y": 34, "y": 34,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "MossdeepCity_Gym_EventScript_220C33" "script": "MossdeepCity_Gym_EventScript_LeftGymStatue"
}, },
{ {
"type": "sign", "type": "sign",
@@ -681,7 +681,7 @@
"y": 34, "y": 34,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "MossdeepCity_Gym_EventScript_220C43" "script": "MossdeepCity_Gym_EventScript_RightGymStatue"
} }
] ]
} }
data/maps/MossdeepCity_Gym/scripts.inc
+227 -221
View File
@@ -1,64 +1,68 @@
MossdeepCity_Gym_MapScripts:: @ 8220800 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 .byte 0
MossdeepCity_Gym_MapScript1_220806: @ 8220806 @ NOTE: Mossdeep Gym was redesigned between R/S and E. Leftover (and now functionally unused) scripts are commented below
goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_22083D
goto MossdeepCity_Gym_EventScript_220815 @ All the below checks are leftover from RS. FLAG_MOSSDEEP_GYM_SWITCH_X is never set
MossdeepCity_Gym_OnLoad: @ 8220806
goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_SetSwitch1Metatiles
goto MossdeepCity_Gym_EventScript_CheckSwitch2
end end
MossdeepCity_Gym_EventScript_220815:: @ 8220815 MossdeepCity_Gym_EventScript_CheckSwitch2:: @ 8220815
goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_220855 goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_SetSwitch2Metatiles
goto MossdeepCity_Gym_EventScript_220824 goto MossdeepCity_Gym_EventScript_CheckSwitch3
end end
MossdeepCity_Gym_EventScript_220824:: @ 8220824 MossdeepCity_Gym_EventScript_CheckSwitch3:: @ 8220824
goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_22086D goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_SetSwitch3Metatiles
goto MossdeepCity_Gym_EventScript_220833 goto MossdeepCity_Gym_EventScript_CheckSwitch4
end end
MossdeepCity_Gym_EventScript_220833:: @ 8220833 MossdeepCity_Gym_EventScript_CheckSwitch4:: @ 8220833
goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_220885 goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_SetSwitch4Metatiles
end end
MossdeepCity_Gym_EventScript_22083D:: @ 822083D @ All the below set metatile scripts are leftover from RS and are functionally unused
setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Top, 0 MossdeepCity_Gym_EventScript_SetSwitch1Metatiles:: @ 822083D
setmetatile 2, 7, METATILE_MossdeepGym_Empty1, 1 setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Right, 0
goto MossdeepCity_Gym_EventScript_220815 setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Down, 1
goto MossdeepCity_Gym_EventScript_CheckSwitch2
end end
MossdeepCity_Gym_EventScript_220855:: @ 8220855 MossdeepCity_Gym_EventScript_SetSwitch2Metatiles:: @ 8220855
setmetatile 8, 14, METATILE_MossdeepGym_Obelisk_Top, 0 setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Right, 0
setmetatile 8, 10, METATILE_MossdeepGym_Empty1, 1 setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Down, 1
goto MossdeepCity_Gym_EventScript_220824 goto MossdeepCity_Gym_EventScript_CheckSwitch3
end end
MossdeepCity_Gym_EventScript_22086D:: @ 822086D MossdeepCity_Gym_EventScript_SetSwitch3Metatiles:: @ 822086D
setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Base, 0 setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Left, 0
setmetatile 17, 15, METATILE_MossdeepGym_Empty1, 1 setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Down, 1
goto MossdeepCity_Gym_EventScript_220833 goto MossdeepCity_Gym_EventScript_CheckSwitch4
end end
MossdeepCity_Gym_EventScript_220885:: @ 8220885 MossdeepCity_Gym_EventScript_SetSwitch4Metatiles:: @ 8220885
setmetatile 1, 23, METATILE_MossdeepGym_Wall_LeftCorner, 0 setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Up, 0
setmetatile 5, 24, METATILE_MossdeepGym_Empty1, 1 setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Down, 1
end end
MossdeepCity_Gym_EventScript_220898:: @ 8220898 MossdeepCity_Gym_EventScript_TateAndLiza:: @ 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 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 specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq MossdeepCity_Gym_EventScript_22097E goto_if_eq MossdeepCity_Gym_EventScript_TateAndLizaRematch
goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_220937 goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_GiveCalmMind2
msgbox MossdeepCity_Gym_Text_221B1D, MSGBOX_DEFAULT msgbox MossdeepCity_Gym_Text_TateAndLizaPostBattle, MSGBOX_DEFAULT
release release
end end
MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 MossdeepCity_Gym_EventScript_TateAndLizaDefeated:: @ 82208D1
message MossdeepCity_Gym_Text_22196A message MossdeepCity_Gym_Text_ReceivedMindBadge
waitmessage waitmessage
call Common_EventScript_PlayGymBadgeFanfare 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_DEFEATED_MOSSDEEP_GYM
setflag FLAG_BADGE07_GET setflag FLAG_BADGE07_GET
setflag FLAG_HIDE_AQUA_HIDEOUT_GRUNTS setflag FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
@@ -74,11 +78,11 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
setvar VAR_MOSSDEEP_CITY_STATE, 1 setvar VAR_MOSSDEEP_CITY_STATE, 1
setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN
setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1 setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1
call MossdeepCity_Gym_EventScript_22095B call MossdeepCity_Gym_EventScript_GiveCalmMind
closemessage closemessage
delay 30 delay 30
playfanfare MUS_ME_TORE_EYE playfanfare MUS_ME_TORE_EYE
msgbox MossdeepCity_Gym_Text_221AEA, MSGBOX_DEFAULT msgbox MossdeepCity_Gym_Text_RegisteredTateAndLiza, MSGBOX_DEFAULT
waitfanfare waitfanfare
closemessage closemessage
delay 30 delay 30
@@ -86,282 +90,284 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
release release
end end
MossdeepCity_Gym_EventScript_220937:: @ 8220937 MossdeepCity_Gym_EventScript_GiveCalmMind2:: @ 8220937
giveitem_std ITEM_TM04 giveitem_std ITEM_TM04
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull goto_if_eq Common_EventScript_ShowBagIsFull
msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT msgbox MossdeepCity_Gym_Text_ExplainCalmMind, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_TM04 setflag FLAG_RECEIVED_TM04
release release
end end
MossdeepCity_Gym_EventScript_22095B:: @ 822095B MossdeepCity_Gym_EventScript_GiveCalmMind:: @ 822095B
giveitem_std ITEM_TM04 giveitem_std ITEM_TM04
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Common_EventScript_BagIsFull goto_if_eq Common_EventScript_BagIsFull
msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT msgbox MossdeepCity_Gym_Text_ExplainCalmMind, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_TM04 setflag FLAG_RECEIVED_TM04
return return
MossdeepCity_Gym_EventScript_22097E:: @ 822097E MossdeepCity_Gym_EventScript_TateAndLizaRematch:: @ 822097E
trainerbattle_rematch_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_221D0B, MossdeepCity_Gym_Text_221E05, MossdeepCity_Gym_Text_221EB8 trainerbattle_rematch_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_TateAndLizaPreRematch, MossdeepCity_Gym_Text_TateAndLizaRematchDefeat, MossdeepCity_Gym_Text_TateAndLizaRematchNeedTwoMons
msgbox MossdeepCity_Gym_Text_221E45, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_TateAndLizaPostRematch, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_220999:: @ 8220999 @ All the below switch scripts are leftover from RS and are functionally unused
MossdeepCity_Gym_EventScript_Switch1:: @ 8220999
lockall lockall
goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_2209D0 goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_ClearSwitch1
setflag FLAG_MOSSDEEP_GYM_SWITCH_1 setflag FLAG_MOSSDEEP_GYM_SWITCH_1
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0 waitmovement 0
setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Top, 0 setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Right, 0
setmetatile 2, 7, METATILE_MossdeepGym_Empty1, 1 setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Down, 1
goto MossdeepCity_Gym_EventScript_2209C8 goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end end
MossdeepCity_Gym_EventScript_2209C8:: @ 82209C8 MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed:: @ 82209C8
special DrawWholeMapView special DrawWholeMapView
playse SE_TK_KASYA playse SE_TK_KASYA
releaseall releaseall
end end
MossdeepCity_Gym_EventScript_2209D0:: @ 82209D0 MossdeepCity_Gym_EventScript_ClearSwitch1:: @ 82209D0
clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0 waitmovement 0
setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Base, 0 setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Left, 0
setmetatile 2, 7, METATILE_MossdeepGym_Empty0, 1 setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Up, 1
goto MossdeepCity_Gym_EventScript_2209C8 goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end end
MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5 MossdeepCity_Gym_EventScript_Switch2:: @ 82209F5
lockall lockall
goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_220A24 goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_ClearSwitch2
setflag FLAG_MOSSDEEP_GYM_SWITCH_2 setflag FLAG_MOSSDEEP_GYM_SWITCH_2
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0 waitmovement 0
setmetatile 8, 14, METATILE_MossdeepGym_Obelisk_Top, 0 setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Right, 0
setmetatile 8, 10, METATILE_MossdeepGym_Empty1, 1 setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Down, 1
goto MossdeepCity_Gym_EventScript_2209C8 goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end end
MossdeepCity_Gym_EventScript_220A24:: @ 8220A24 MossdeepCity_Gym_EventScript_ClearSwitch2:: @ 8220A24
clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0 waitmovement 0
setmetatile 8, 14, METATILE_MossdeepGym_OuterWall_RightCorner, 0 setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Down, 0
setmetatile 8, 10, METATILE_MossdeepGym_Empty0, 1 setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Up, 1
goto MossdeepCity_Gym_EventScript_2209C8 goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end end
MossdeepCity_Gym_EventScript_220A49:: @ 8220A49 MossdeepCity_Gym_EventScript_Switch3:: @ 8220A49
lockall lockall
goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_220A78 goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_ClearSwitch3
setflag FLAG_MOSSDEEP_GYM_SWITCH_3 setflag FLAG_MOSSDEEP_GYM_SWITCH_3
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0 waitmovement 0
setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Base, 0 setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Left, 0
setmetatile 17, 15, METATILE_MossdeepGym_Empty1, 1 setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Down, 1
goto MossdeepCity_Gym_EventScript_2209C8 goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end end
MossdeepCity_Gym_EventScript_220A78:: @ 8220A78 MossdeepCity_Gym_EventScript_ClearSwitch3:: @ 8220A78
clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0 waitmovement 0
setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Top, 0 setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Right, 0
setmetatile 17, 15, METATILE_MossdeepGym_Empty0, 1 setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Up, 1
goto MossdeepCity_Gym_EventScript_2209C8 goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end end
MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D MossdeepCity_Gym_EventScript_Switch4:: @ 8220A9D
lockall lockall
goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_220ACC goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_ClearSwitch4
setflag FLAG_MOSSDEEP_GYM_SWITCH_4 setflag FLAG_MOSSDEEP_GYM_SWITCH_4
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0 waitmovement 0
setmetatile 1, 23, METATILE_MossdeepGym_Wall_LeftCorner, 0 setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Up, 0
setmetatile 5, 24, METATILE_MossdeepGym_Empty1, 1 setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Down, 1
goto MossdeepCity_Gym_EventScript_2209C8 goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end end
MossdeepCity_Gym_EventScript_220ACC:: @ 8220ACC MossdeepCity_Gym_EventScript_ClearSwitch4:: @ 8220ACC
clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0 waitmovement 0
setmetatile 1, 23, METATILE_MossdeepGym_Obelisk_Top, 0 setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Right, 0
setmetatile 5, 24, METATILE_MossdeepGym_Empty0, 1 setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Up, 1
goto MossdeepCity_Gym_EventScript_2209C8 goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
end end
MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1 MossdeepCity_Gym_EventScript_WarpToEntrance:: @ 8220AF1
lockall lockall
warp7 MAP_MOSSDEEP_CITY_GYM, 255, 7, 30 warpmossdeepgym MAP_MOSSDEEP_CITY_GYM, 255, 7, 30
waitstate waitstate
releaseall releaseall
end end
MossdeepCity_Gym_EventScript_220AFD:: @ 8220AFD MossdeepCity_Gym_EventScript_Preston:: @ 8220AFD
trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_PrestonPreBattle, MossdeepCity_Gym_Text_PrestonDefeat
msgbox MossdeepCity_Gym_Text_220ED3, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_220B14:: @ 8220B14 MossdeepCity_Gym_EventScript_Virgil:: @ 8220B14
trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_VirgilPreBattle, MossdeepCity_Gym_Text_VirgilDefeat
msgbox MossdeepCity_Gym_Text_220F3A, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_VirgilPostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_220B2B:: @ 8220B2B MossdeepCity_Gym_EventScript_Blake:: @ 8220B2B
trainerbattle_single TRAINER_BLAKE, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024 trainerbattle_single TRAINER_BLAKE, MossdeepCity_Gym_Text_BlakePreBattle, MossdeepCity_Gym_Text_BlakeDefeat
msgbox MossdeepCity_Gym_Text_221055, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_BlakePostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_220B42:: @ 8220B42 MossdeepCity_Gym_EventScript_Hannah:: @ 8220B42
trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152 trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_HannahPreBattle, MossdeepCity_Gym_Text_HannahDefeat
msgbox MossdeepCity_Gym_Text_22116A, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_HannahPostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_220B59:: @ 8220B59 MossdeepCity_Gym_EventScript_Samantha:: @ 8220B59
trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230 trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_SamanthaPreBattle, MossdeepCity_Gym_Text_SamanthaDefeat
msgbox MossdeepCity_Gym_Text_22123D, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_SamanthaPostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_220B70:: @ 8220B70 MossdeepCity_Gym_EventScript_Maura:: @ 8220B70
trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309 trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_MauraPreBattle, MossdeepCity_Gym_Text_MauraDefeat
msgbox MossdeepCity_Gym_Text_22132E, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_MauraPostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_220B87:: @ 8220B87 MossdeepCity_Gym_EventScript_Sylvia:: @ 8220B87
trainerbattle_single TRAINER_SYLVIA, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4 trainerbattle_single TRAINER_SYLVIA, MossdeepCity_Gym_Text_SylviaPreBattle, MossdeepCity_Gym_Text_SylviaDefeat
msgbox MossdeepCity_Gym_Text_221412, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_SylviaPostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_220B9E:: @ 8220B9E MossdeepCity_Gym_EventScript_Nate:: @ 8220B9E
trainerbattle_single TRAINER_NATE, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7 trainerbattle_single TRAINER_NATE, MossdeepCity_Gym_Text_NatePreBattle, MossdeepCity_Gym_Text_NateDefeat
msgbox MossdeepCity_Gym_Text_2214D3, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_NatePostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_220BB5:: @ 8220BB5 MossdeepCity_Gym_EventScript_Macey:: @ 8220BB5
trainerbattle_single TRAINER_MACEY, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658 trainerbattle_single TRAINER_MACEY, MossdeepCity_Gym_Text_MaceyPreBattle, MossdeepCity_Gym_Text_MaceyDefeat
msgbox MossdeepCity_Gym_Text_221680, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_MaceyPostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_220BCC:: @ 8220BCC MossdeepCity_Gym_EventScript_Clifford:: @ 8220BCC
trainerbattle_single TRAINER_CLIFFORD, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8 trainerbattle_single TRAINER_CLIFFORD, MossdeepCity_Gym_Text_CliffordPreBattle, MossdeepCity_Gym_Text_CliffordDefeat
msgbox MossdeepCity_Gym_Text_2215E2, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_220BE3:: @ 8220BE3 MossdeepCity_Gym_EventScript_Nicholas:: @ 8220BE3
trainerbattle_single TRAINER_NICHOLAS, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D trainerbattle_single TRAINER_NICHOLAS, MossdeepCity_Gym_Text_NicholasPreBattle, MossdeepCity_Gym_Text_NicholasDefeat
msgbox MossdeepCity_Gym_Text_22173A, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_NicholasPostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA MossdeepCity_Gym_EventScript_Kathleen:: @ 8220BFA
trainerbattle_single TRAINER_KATHLEEN, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B trainerbattle_single TRAINER_KATHLEEN, MossdeepCity_Gym_Text_KathleenPreBattle, MossdeepCity_Gym_Text_KathleenDefeat
msgbox MossdeepCity_Gym_Text_221545, MSGBOX_AUTOCLOSE msgbox MossdeepCity_Gym_Text_KathleenPostBattle, MSGBOX_AUTOCLOSE
end end
MossdeepCity_Gym_EventScript_220C11:: @ 8220C11 MossdeepCity_Gym_EventScript_GymGuide:: @ 8220C11
lock lock
faceplayer faceplayer
goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_220C26 goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_GymGuidePostVictory
msgbox MossdeepCity_Gym_Text_220CD5, MSGBOX_DEFAULT msgbox MossdeepCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT
release release
end end
MossdeepCity_Gym_EventScript_220C26:: @ 8220C26 MossdeepCity_Gym_EventScript_GymGuidePostVictory:: @ 8220C26
msgbox MossdeepCity_Gym_Text_220E2A, MSGBOX_DEFAULT msgbox MossdeepCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT
release release
end end
MossdeepCity_Gym_Movement_220C30: @ 8220C30 @ Leftover from RS, functionally unused
MossdeepCity_Gym_Movement_WaitAfterSwitchUse: @ 8220C30
delay_16 delay_16
delay_16 delay_16
step_end step_end
MossdeepCity_Gym_EventScript_220C33:: @ 8220C33 MossdeepCity_Gym_EventScript_LeftGymStatue:: @ 8220C33
lockall lockall
goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_220C53 goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_GymStatueCertified
goto MossdeepCity_Gym_EventScript_220C5D goto MossdeepCity_Gym_EventScript_GymStatue
end end
MossdeepCity_Gym_EventScript_220C43:: @ 8220C43 MossdeepCity_Gym_EventScript_RightGymStatue:: @ 8220C43
lockall lockall
goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_220C53 goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_GymStatueCertified
goto MossdeepCity_Gym_EventScript_220C5D goto MossdeepCity_Gym_EventScript_GymStatue
end end
MossdeepCity_Gym_EventScript_220C53:: @ 8220C53 MossdeepCity_Gym_EventScript_GymStatueCertified:: @ 8220C53
msgbox MossdeepCity_Gym_Text_221CCA, MSGBOX_DEFAULT msgbox MossdeepCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT
releaseall releaseall
end end
MossdeepCity_Gym_EventScript_220C5D:: @ 8220C5D MossdeepCity_Gym_EventScript_GymStatue:: @ 8220C5D
msgbox MossdeepCity_Gym_Text_221CB0, MSGBOX_DEFAULT msgbox MossdeepCity_Gym_Text_GymStatue, MSGBOX_DEFAULT
releaseall releaseall
end end
MossdeepCity_Gym_EventScript_220C67:: @ 8220C67 MossdeepCity_Gym_EventScript_YellowFloorSwitch:: @ 8220C67
playse SE_MU_PACHI playse SE_MU_PACHI
waitse waitse
playse SE_TU_SAA playse SE_TU_SAA
mossdeepgym3 0 initrotatingtilepuzzle FALSE
mossdeepgym1 0 moverotatingtileobjects 0
waitmovement 0 waitmovement 0
mossdeepgym2 turnrotatingtileobjects
waitmovement 0 waitmovement 0
mossdeepgym4 freerotatingtilepuzzle
end end
MossdeepCity_Gym_EventScript_220C7D:: @ 8220C7D MossdeepCity_Gym_EventScript_BlueFloorSwitch:: @ 8220C7D
playse SE_MU_PACHI playse SE_MU_PACHI
waitse waitse
playse SE_TU_SAA playse SE_TU_SAA
mossdeepgym3 0 initrotatingtilepuzzle FALSE
mossdeepgym1 1 moverotatingtileobjects 1
waitmovement 0 waitmovement 0
mossdeepgym2 turnrotatingtileobjects
waitmovement 0 waitmovement 0
mossdeepgym4 freerotatingtilepuzzle
end end
MossdeepCity_Gym_EventScript_220C93:: @ 8220C93 MossdeepCity_Gym_EventScript_GreenFloorSwitch:: @ 8220C93
playse SE_MU_PACHI playse SE_MU_PACHI
waitse waitse
playse SE_TU_SAA playse SE_TU_SAA
mossdeepgym3 0 initrotatingtilepuzzle FALSE
mossdeepgym1 2 moverotatingtileobjects 2
waitmovement 0 waitmovement 0
mossdeepgym2 turnrotatingtileobjects
waitmovement 0 waitmovement 0
mossdeepgym4 freerotatingtilepuzzle
end end
MossdeepCity_Gym_EventScript_220CA9:: @ 8220CA9 MossdeepCity_Gym_EventScript_PurpleFloorSwitch:: @ 8220CA9
playse SE_MU_PACHI playse SE_MU_PACHI
waitse waitse
playse SE_TU_SAA playse SE_TU_SAA
mossdeepgym3 0 initrotatingtilepuzzle FALSE
mossdeepgym1 3 moverotatingtileobjects 3
waitmovement 0 waitmovement 0
mossdeepgym2 turnrotatingtileobjects
waitmovement 0 waitmovement 0
mossdeepgym4 freerotatingtilepuzzle
end end
MossdeepCity_Gym_EventScript_220CBF:: @ 8220CBF MossdeepCity_Gym_EventScript_RedFloorSwitch:: @ 8220CBF
playse SE_MU_PACHI playse SE_MU_PACHI
waitse waitse
playse SE_TU_SAA playse SE_TU_SAA
mossdeepgym3 0 initrotatingtilepuzzle FALSE
mossdeepgym1 4 moverotatingtileobjects 4
waitmovement 0 waitmovement 0
mossdeepgym2 turnrotatingtileobjects
waitmovement 0 waitmovement 0
mossdeepgym4 freerotatingtilepuzzle
end end
MossdeepCity_Gym_Text_220CD5: @ 8220CD5 MossdeepCity_Gym_Text_GymGuideAdvice: @ 8220CD5
.string "Yo, how's it going, CHAMPION-bound\n" .string "Yo, how's it going, CHAMPION-bound\n"
.string "{PLAYER}?\p" .string "{PLAYER}?\p"
.string "The GYM LEADERS here use\n" .string "The GYM LEADERS here use\n"
@@ -375,46 +381,46 @@ MossdeepCity_Gym_Text_220CD5: @ 8220CD5
.string "them how tight you are with your\l" .string "them how tight you are with your\l"
.string "POKéMON. Go for it!$" .string "POKéMON. Go for it!$"
MossdeepCity_Gym_Text_220E2A: @ 8220E2A MossdeepCity_Gym_Text_GymGuidePostVictory: @ 8220E2A
.string "Wow, you're astounding!\n" .string "Wow, you're astounding!\n"
.string "You're one great TRAINER!$" .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 "Battles hinge on the strength of your\n"
.string "spirit! The weak-spirited will never win!$" .string "spirit! The weak-spirited will never win!$"
MossdeepCity_Gym_Text_220EAC: @ 8220EAC MossdeepCity_Gym_Text_PrestonDefeat: @ 8220EAC
.string "I lost!\n" .string "I lost!\n"
.string "I must temper my spirit again!$" .string "I must temper my spirit again!$"
MossdeepCity_Gym_Text_220ED3: @ 8220ED3 MossdeepCity_Gym_Text_PrestonPostBattle: @ 8220ED3
.string "The indecisive lose.\n" .string "The indecisive lose.\n"
.string "That's my warning to you.$" .string "That's my warning to you.$"
MossdeepCity_Gym_Text_220F02: @ 8220F02 MossdeepCity_Gym_Text_VirgilPreBattle: @ 8220F02
.string "Let me see your talent!$" .string "Let me see your talent!$"
MossdeepCity_Gym_Text_220F1A: @ 8220F1A MossdeepCity_Gym_Text_VirgilDefeat: @ 8220F1A
.string "You possess spectacular talent!$" .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 "If there are prodigies in the world,\n"
.string "then our GYM LEADERS are them!\p" .string "then our GYM LEADERS are them!\p"
.string "However, you may be even more talented\n" .string "However, you may be even more talented\n"
.string "than them…$" .string "than them…$"
MossdeepCity_Gym_Text_220FB0: @ 8220FB0 MossdeepCity_Gym_Text_BlakePreBattle: @ 8220FB0
.string "Fufufufu… Watch me levitate a POKé\n" .string "Fufufufu… Watch me levitate a POKé\n"
.string "BALL telekinetically!\p" .string "BALL telekinetically!\p"
.string "Wrooooooooaaaar!\n" .string "Wrooooooooaaaar!\n"
.string "… … … … … … …\p" .string "… … … … … … …\p"
.string "Sometimes, I'm out of sync…$" .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 "My POKéMON battling skills are out\n"
.string "of sync, too!$" .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 "A POKé BALL was too heavy to lift\n"
.string "psychically. But this dust bunny…\p" .string "psychically. But this dust bunny…\p"
.string "Whoooooooooooooooh!\n" .string "Whoooooooooooooooh!\n"
@@ -422,127 +428,127 @@ MossdeepCity_Gym_Text_221055: @ 8221055
.string "No, I'm not cheating!\n" .string "No, I'm not cheating!\n"
.string "I didn't blow on it! Honestly!$" .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 "When you lose to me, don't be too hard\n"
.string "on yourself.\p" .string "on yourself.\p"
.string "It's not that you're weak--I'm just\n" .string "It's not that you're weak--I'm just\n"
.string "too strong!$" .string "too strong!$"
MossdeepCity_Gym_Text_221152: @ 8221152 MossdeepCity_Gym_Text_HannahDefeat: @ 8221152
.string "You're just too strong!$" .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 "I'm not going to get down on myself for\n"
.string "losing. I just need to train harder.\p" .string "losing. I just need to train harder.\p"
.string "Positive thinking--that's my strong\n" .string "Positive thinking--that's my strong\n"
.string "point!$" .string "point!$"
MossdeepCity_Gym_Text_2211E2: @ 82211E2 MossdeepCity_Gym_Text_SamanthaPreBattle: @ 82211E2
.string "I see it…\n" .string "I see it…\n"
.string "I see your future…\p" .string "I see your future…\p"
.string "If you can beat me, I will tell you\n" .string "If you can beat me, I will tell you\n"
.string "your future!$" .string "your future!$"
MossdeepCity_Gym_Text_221230: @ 8221230 MossdeepCity_Gym_Text_SamanthaDefeat: @ 8221230
.string "I surrender!$" .string "I surrender!$"
MossdeepCity_Gym_Text_22123D: @ 822123D MossdeepCity_Gym_Text_SamanthaPostBattle: @ 822123D
.string "You will wage a terrifically intense\n" .string "You will wage a terrifically intense\n"
.string "battle with our GYM LEADERS…\p" .string "battle with our GYM LEADERS…\p"
.string "The result…\n" .string "The result…\n"
.string "You won't hear it from me!$" .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 "The roads you have traveled…\n"
.string "What you have experienced…\p" .string "What you have experienced…\p"
.string "Come at me with everything you've\n" .string "Come at me with everything you've\n"
.string "learned!$" .string "learned!$"
MossdeepCity_Gym_Text_221309: @ 8221309 MossdeepCity_Gym_Text_MauraDefeat: @ 8221309
.string "You've traveled a path of greatness!$" .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 "A bright future awaits those who have\n"
.string "worked diligently.\p" .string "worked diligently.\p"
.string "For those who lazed idly, there is\n" .string "For those who lazed idly, there is\n"
.string "only despair at the end.\p" .string "only despair at the end.\p"
.string "What goes around comes around…$" .string "What goes around comes around…$"
MossdeepCity_Gym_Text_2213C2: @ 82213C2 MossdeepCity_Gym_Text_SylviaPreBattle: @ 82213C2
.string "Even at the risk of life, I will win\n" .string "Even at the risk of life, I will win\n"
.string "this battle!$" .string "this battle!$"
MossdeepCity_Gym_Text_2213F4: @ 82213F4 MossdeepCity_Gym_Text_SylviaDefeat: @ 82213F4
.string "What you do…\n" .string "What you do…\n"
.string "It horrifies me…$" .string "It horrifies me…$"
MossdeepCity_Gym_Text_221412: @ 8221412 MossdeepCity_Gym_Text_SylviaPostBattle: @ 8221412
.string "How dare you beat me…\p" .string "How dare you beat me…\p"
.string "It won't be my fault if something\n" .string "It won't be my fault if something\n"
.string "horrible befalls you…$" .string "horrible befalls you…$"
MossdeepCity_Gym_Text_221460: @ 8221460 MossdeepCity_Gym_Text_NatePreBattle: @ 8221460
.string "Hohoho.\p" .string "Hohoho.\p"
.string "You need me to show you how tenacious\n" .string "You need me to show you how tenacious\n"
.string "the PSYCHIC type can be.$" .string "the PSYCHIC type can be.$"
MossdeepCity_Gym_Text_2214A7: @ 82214A7 MossdeepCity_Gym_Text_NateDefeat: @ 82214A7
.string "Oh! My, my!\n" .string "Oh! My, my!\n"
.string "Your battle style is fantastic!$" .string "Your battle style is fantastic!$"
MossdeepCity_Gym_Text_2214D3: @ 82214D3 MossdeepCity_Gym_Text_NatePostBattle: @ 82214D3
.string "I… I don't let defeat rattle m-me,\n" .string "I… I don't let defeat rattle m-me,\n"
.string "however b-badly.$" .string "however b-badly.$"
MossdeepCity_Gym_Text_221507: @ 8221507 MossdeepCity_Gym_Text_KathleenPreBattle: @ 8221507
.string "Let me show you a perfectly awful,\n" .string "Let me show you a perfectly awful,\n"
.string "horrifying time!$" .string "horrifying time!$"
MossdeepCity_Gym_Text_22153B: @ 822153B MossdeepCity_Gym_Text_KathleenDefeat: @ 822153B
.string "N-nooooo!$" .string "N-nooooo!$"
MossdeepCity_Gym_Text_221545: @ 8221545 MossdeepCity_Gym_Text_KathleenPostBattle: @ 8221545
.string "Your vitality is contagious!\n" .string "Your vitality is contagious!\n"
.string "Get away from me quickly!$" .string "Get away from me quickly!$"
MossdeepCity_Gym_Text_22157C: @ 822157C MossdeepCity_Gym_Text_CliffordPreBattle: @ 822157C
.string "I may be past my prime, but I suggest\n" .string "I may be past my prime, but I suggest\n"
.string "you not patronize me.$" .string "you not patronize me.$"
MossdeepCity_Gym_Text_2215B8: @ 82215B8 MossdeepCity_Gym_Text_CliffordDefeat: @ 82215B8
.string "Ah, you overflow with the power\n" .string "Ah, you overflow with the power\n"
.string "of youth!$" .string "of youth!$"
MossdeepCity_Gym_Text_2215E2: @ 82215E2 MossdeepCity_Gym_Text_CliffordPostBattle: @ 82215E2
.string "It seems that I could not overcome\n" .string "It seems that I could not overcome\n"
.string "your youthful energy.$" .string "your youthful energy.$"
MossdeepCity_Gym_Text_22161B: @ 822161B MossdeepCity_Gym_Text_MaceyPreBattle: @ 822161B
.string "You're not getting through to the end!\n" .string "You're not getting through to the end!\n"
.string "Not if I can help it!$" .string "Not if I can help it!$"
MossdeepCity_Gym_Text_221658: @ 8221658 MossdeepCity_Gym_Text_MaceyDefeat: @ 8221658
.string "How could you be so ludicrously\n" .string "How could you be so ludicrously\n"
.string "strong?$" .string "strong?$"
MossdeepCity_Gym_Text_221680: @ 8221680 MossdeepCity_Gym_Text_MaceyPostBattle: @ 8221680
.string "Humph! You may be strong, but you're\n" .string "Humph! You may be strong, but you're\n"
.string "not suitable for the PSYCHIC type!\p" .string "not suitable for the PSYCHIC type!\p"
.string "The way you battle is somehow brutal!$" .string "The way you battle is somehow brutal!$"
MossdeepCity_Gym_Text_2216EE: @ 82216EE MossdeepCity_Gym_Text_NicholasPreBattle: @ 82216EE
.string "Wroooar! Have a taste of my super\n" .string "Wroooar! Have a taste of my super\n"
.string "POKéMON hard-battling power!$" .string "POKéMON hard-battling power!$"
MossdeepCity_Gym_Text_22172D: @ 822172D MossdeepCity_Gym_Text_NicholasDefeat: @ 822172D
.string "Oh!\n" .string "Oh!\n"
.string "Done in!$" .string "Done in!$"
MossdeepCity_Gym_Text_22173A: @ 822173A MossdeepCity_Gym_Text_NicholasPostBattle: @ 822173A
.string "All right! I think I'll develop a special\n" .string "All right! I think I'll develop a special\n"
.string "invincible POKéMON power next.$" .string "invincible POKéMON power next.$"
MossdeepCity_Gym_Text_221783: @ 8221783 MossdeepCity_Gym_Text_TateAndLizaPreBattle: @ 8221783
.string "TATE: Hehehe… Were you surprised?\p" .string "TATE: Hehehe… Were you surprised?\p"
.string "LIZA: Fufufu… Were you surprised?\p" .string "LIZA: Fufufu… Were you surprised?\p"
.string "TATE: That there are two GYM LEADERS?\n" .string "TATE: That there are two GYM LEADERS?\n"
@@ -556,24 +562,24 @@ MossdeepCity_Gym_Text_221783: @ 8221783
.string "TATE: This combination of ours…\n" .string "TATE: This combination of ours…\n"
.string "LIZA: Can you beat it?$" .string "LIZA: Can you beat it?$"
MossdeepCity_Gym_Text_2218EC: @ 82218EC MossdeepCity_Gym_Text_TateAndLizaDefeat: @ 82218EC
.string "TATE: What?! Our combination…\n" .string "TATE: What?! Our combination…\n"
.string "LIZA: Was shattered!\p" .string "LIZA: Was shattered!\p"
.string "TATE: It can't be helped. You've won…\n" .string "TATE: It can't be helped. You've won…\n"
.string "LIZA: So, in recognition, take this.$" .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 "{PLAYER} received the MIND BADGE\n"
.string "from TATE and LIZA.$" .string "from TATE and LIZA.$"
MossdeepCity_Gym_Text_221999: @ 8221999 MossdeepCity_Gym_Text_ExplainMindBadgeTakeThis: @ 8221999
.string "TATE: The MIND BADGE enhances the\n" .string "TATE: The MIND BADGE enhances the\n"
.string "SP. ATK and SP. DEF of POKéMON.\p" .string "SP. ATK and SP. DEF of POKéMON.\p"
.string "LIZA: It also lets you use the HM move\n" .string "LIZA: It also lets you use the HM move\n"
.string "DIVE outside of battle.\p" .string "DIVE outside of battle.\p"
.string "TATE: You should also take this, too.$" .string "TATE: You should also take this, too.$"
MossdeepCity_Gym_Text_221A40: @ 8221A40 MossdeepCity_Gym_Text_ExplainCalmMind: @ 8221A40
.string "TATE: That TM04 contains…\n" .string "TATE: That TM04 contains…\n"
.string "LIZA: CALM MIND!\p" .string "LIZA: CALM MIND!\p"
.string "TATE: It raises SP. ATK and…\n" .string "TATE: It raises SP. ATK and…\n"
@@ -582,18 +588,18 @@ MossdeepCity_Gym_Text_221A40: @ 8221A40
.string "LIZA: For PSYCHIC POKéMON!\p" .string "LIZA: For PSYCHIC POKéMON!\p"
.string "… … … … … …$" .string "… … … … … …$"
MossdeepCity_Gym_Text_221AEA: @ 8221AEA MossdeepCity_Gym_Text_RegisteredTateAndLiza: @ 8221AEA
.string "Registered GYM LEADERS TATE & LIZA\n" .string "Registered GYM LEADERS TATE & LIZA\n"
.string "in the POKéNAV.$" .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 "TATE: Looks like the bond between you\n"
.string "and your POKéMON is far stronger than\l" .string "and your POKéMON is far stronger than\l"
.string "the bond that we share as twins.\p" .string "the bond that we share as twins.\p"
.string "LIZA: You will become even stronger!\n" .string "LIZA: You will become even stronger!\n"
.string "We've battled you, so we know.$" .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 "TATE: Hehehe… Were you surprised?\p"
.string "LIZA: That there are two GYM LEADERS?\p" .string "LIZA: That there are two GYM LEADERS?\p"
.string "TATE: Oops, you have only one…\n" .string "TATE: Oops, you have only one…\n"
@@ -602,15 +608,15 @@ MossdeepCity_Gym_Text_221BCE: @ 8221BCE
.string "LIZA: If you want to challenge us,\n" .string "LIZA: If you want to challenge us,\n"
.string "bring some more POKéMON.$" .string "bring some more POKéMON.$"
MossdeepCity_Gym_Text_221CB0: @ 8221CB0 MossdeepCity_Gym_Text_GymStatue: @ 8221CB0
.string "MOSSDEEP CITY POKéMON GYM$" .string "MOSSDEEP CITY POKéMON GYM$"
MossdeepCity_Gym_Text_221CCA: @ 8221CCA MossdeepCity_Gym_Text_GymStatueCertified: @ 8221CCA
.string "MOSSDEEP CITY POKéMON GYM\p" .string "MOSSDEEP CITY POKéMON GYM\p"
.string "LIZA AND TATE'S CERTIFIED TRAINERS:\n" .string "LIZA AND TATE'S CERTIFIED TRAINERS:\n"
.string "{PLAYER}$" .string "{PLAYER}$"
MossdeepCity_Gym_Text_221D0B: @ 8221D0B MossdeepCity_Gym_Text_TateAndLizaPreRematch: @ 8221D0B
.string "TATE: POKéMON…\n" .string "TATE: POKéMON…\n"
.string "LIZA: POKéMON…\p" .string "LIZA: POKéMON…\p"
.string "TATE: By changing the party's mix…\n" .string "TATE: By changing the party's mix…\n"
@@ -622,17 +628,17 @@ MossdeepCity_Gym_Text_221D0B: @ 8221D0B
.string "TATE: Our combination…\n" .string "TATE: Our combination…\n"
.string "LIZA: We'll show you again and again!$" .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 "TATE: You and your POKéMON…\n"
.string "LIZA: It's as if you were siblings!$" .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 "TATE: You can knock us down,\n"
.string "but we'll never stay down!\p" .string "but we'll never stay down!\p"
.string "LIZA: Because the two of us,\n" .string "LIZA: Because the two of us,\n"
.string "we always support each other!$" .string "we always support each other!$"
MossdeepCity_Gym_Text_221EB8: @ 8221EB8 MossdeepCity_Gym_Text_TateAndLizaRematchNeedTwoMons: @ 8221EB8
.string "TATE: You're back again…\n" .string "TATE: You're back again…\n"
.string "LIZA: You're back again…\p" .string "LIZA: You're back again…\p"
.string "TATE: To give us a rematch.\n" .string "TATE: To give us a rematch.\n"
data/maps/MtChimney/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ MtChimney_OnTransition: @ 822EDCC
end end
MtChimney_MapScript1_22EDD2: @ 822EDD2 MtChimney_MapScript1_22EDD2: @ 822EDD2
setstepcallback 1 setstepcallback STEP_CB_ASH
end end
MtChimney_EventScript_22EDD5:: @ 822EDD5 MtChimney_EventScript_22EDD5:: @ 822EDD5
data/maps/MtPyre_2F/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ MtPyre_2F_MapScripts:: @ 82310FB
.byte 0 .byte 0
MtPyre_2F_SetHoleWarp: @ 823110B MtPyre_2F_SetHoleWarp: @ 823110B
setstepcallback 7 setstepcallback STEP_CB_CRACKED_FLOOR
setholewarp MAP_MT_PYRE_1F, 255, 0, 0 setholewarp MAP_MT_PYRE_1F, 255, 0, 0
end end
data/maps/PacifidlogTown/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ PacifidlogTown_OnTransition: @ 81EBABC
end end
PacifidlogTown_MapScript1_1EBAC0: @ 81EBAC0 PacifidlogTown_MapScript1_1EBAC0: @ 81EBAC0
setstepcallback 3 setstepcallback STEP_CB_PACIFIDLOG_BRIDGE
end end
PacifidlogTown_EventScript_1EBAC3:: @ 81EBAC3 PacifidlogTown_EventScript_1EBAC3:: @ 81EBAC3
data/maps/PetalburgCity/scripts.inc
+2 -2
View File
@@ -51,7 +51,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E
clearflag FLAG_HIDE_MAP_NAME_POPUP clearflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_PETALBURG_CITY_STATE, 3 setvar VAR_PETALBURG_CITY_STATE, 3
fadedefaultbgm fadedefaultbgm
clearflag FLAG_SPECIAL_FLAG_0x4001 clearflag FLAG_DONT_TRANSITION_MUSIC
special LoadPlayerParty special LoadPlayerParty
setvar VAR_PETALBURG_GYM_STATE, 1 setvar VAR_PETALBURG_GYM_STATE, 1
warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 warp MAP_PETALBURG_CITY_GYM, 255, 4, 108
@@ -78,7 +78,7 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390
waitdooranim waitdooranim
clearflag FLAG_HIDE_MAP_NAME_POPUP clearflag FLAG_HIDE_MAP_NAME_POPUP
fadedefaultbgm fadedefaultbgm
clearflag FLAG_SPECIAL_FLAG_0x4001 clearflag FLAG_DONT_TRANSITION_MUSIC
warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4 warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4
waitstate waitstate
releaseall releaseall
data/maps/PetalburgCity_Gym/map.json
+23 -23
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_2049F1", "script": "PetalburgCity_Gym_EventScript_Norman",
"flag": "FLAG_HIDE_PETALBURG_GYM_NORMAN" "flag": "FLAG_HIDE_PETALBURG_GYM_NORMAN"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_2054AA", "script": "PetalburgCity_Gym_EventScript_Mary",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_2053BA", "script": "PetalburgCity_Gym_EventScript_Randall",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_2053F6", "script": "PetalburgCity_Gym_EventScript_Parker",
"flag": "0" "flag": "0"
}, },
{ {
@@ -76,7 +76,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_2054E6", "script": "PetalburgCity_Gym_EventScript_Alexia",
"flag": "0" "flag": "0"
}, },
{ {
@@ -89,7 +89,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_205432", "script": "PetalburgCity_Gym_EventScript_George",
"flag": "0" "flag": "0"
}, },
{ {
@@ -102,7 +102,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_205522", "script": "PetalburgCity_Gym_EventScript_Jody",
"flag": "0" "flag": "0"
}, },
{ {
@@ -115,7 +115,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_20546E", "script": "PetalburgCity_Gym_EventScript_Berke",
"flag": "0" "flag": "0"
}, },
{ {
@@ -128,7 +128,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_20574F", "script": "PetalburgCity_Gym_EventScript_GymGuide",
"flag": "FLAG_HIDE_PETALBURG_GYM_GREETER" "flag": "FLAG_HIDE_PETALBURG_GYM_GREETER"
}, },
{ {
@@ -434,7 +434,7 @@
"y": 105, "y": 105,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_205137" "script": "PetalburgCity_Gym_EventScript_SpeedRoomDoor"
}, },
{ {
"type": "sign", "type": "sign",
@@ -442,7 +442,7 @@
"y": 105, "y": 105,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_205187" "script": "PetalburgCity_Gym_EventScript_AccuracyRoomDoor"
}, },
{ {
"type": "sign", "type": "sign",
@@ -450,7 +450,7 @@
"y": 79, "y": 79,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_2051BC" "script": "PetalburgCity_Gym_EventScript_ConfusionRoomDoor"
}, },
{ {
"type": "sign", "type": "sign",
@@ -458,7 +458,7 @@
"y": 79, "y": 79,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_2051EF" "script": "PetalburgCity_Gym_EventScript_LeftDefenseRoomDoor"
}, },
{ {
"type": "sign", "type": "sign",
@@ -466,7 +466,7 @@
"y": 92, "y": 92,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_205222" "script": "PetalburgCity_Gym_EventScript_RightDefenseRoomDoor"
}, },
{ {
"type": "sign", "type": "sign",
@@ -474,7 +474,7 @@
"y": 92, "y": 92,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_205255" "script": "PetalburgCity_Gym_EventScript_RecoveryRoomDoor"
}, },
{ {
"type": "sign", "type": "sign",
@@ -482,7 +482,7 @@
"y": 40, "y": 40,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_205288" "script": "PetalburgCity_Gym_EventScript_LeftStrengthRoomDoor"
}, },
{ {
"type": "sign", "type": "sign",
@@ -490,7 +490,7 @@
"y": 53, "y": 53,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_2052BB" "script": "PetalburgCity_Gym_EventScript_RightStrengthRoomDoor"
}, },
{ {
"type": "sign", "type": "sign",
@@ -498,7 +498,7 @@
"y": 53, "y": 53,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_2052EE" "script": "PetalburgCity_Gym_EventScript_LeftOHKORoomDoor"
}, },
{ {
"type": "sign", "type": "sign",
@@ -506,7 +506,7 @@
"y": 66, "y": 66,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_205321" "script": "PetalburgCity_Gym_EventScript_RightOHKORoomDoor"
}, },
{ {
"type": "sign", "type": "sign",
@@ -514,7 +514,7 @@
"y": 14, "y": 14,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_205354" "script": "PetalburgCity_Gym_EventScript_LeftGymLeadersRoomDoor"
}, },
{ {
"type": "sign", "type": "sign",
@@ -522,7 +522,7 @@
"y": 27, "y": 27,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "PetalburgCity_Gym_EventScript_205387" "script": "PetalburgCity_Gym_EventScript_RightGymLeadersRoomDoor"
}, },
{ {
"type": "sign", "type": "sign",
@@ -530,7 +530,7 @@
"y": 110, "y": 110,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "PetalburgCity_Gym_EventScript_20576E" "script": "PetalburgCity_Gym_EventScript_LeftGymStatue"
}, },
{ {
"type": "sign", "type": "sign",
@@ -538,7 +538,7 @@
"y": 110, "y": 110,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "PetalburgCity_Gym_EventScript_20577E" "script": "PetalburgCity_Gym_EventScript_RightGymStatue"
} }
] ]
} }
data/maps/PetalburgCity_Gym/scripts.inc
+503 -496
View File
File diff suppressed because it is too large Load Diff
data/maps/Route110_TrickHousePuzzle7/scripts.inc
+20 -20
View File
@@ -222,60 +222,60 @@ Route110_TrickHousePuzzle7_EventScript_26E31B:: @ 826E31B
playse SE_MU_PACHI playse SE_MU_PACHI
waitse waitse
playse SE_TU_SAA playse SE_TU_SAA
mossdeepgym3 1 initrotatingtilepuzzle TRUE
mossdeepgym1 0 moverotatingtileobjects 0
waitmovement 0 waitmovement 0
mossdeepgym2 turnrotatingtileobjects
waitmovement 0 waitmovement 0
mossdeepgym4 freerotatingtilepuzzle
end end
Route110_TrickHousePuzzle7_EventScript_26E331:: @ 826E331 Route110_TrickHousePuzzle7_EventScript_26E331:: @ 826E331
playse SE_MU_PACHI playse SE_MU_PACHI
waitse waitse
playse SE_TU_SAA playse SE_TU_SAA
mossdeepgym3 1 initrotatingtilepuzzle TRUE
mossdeepgym1 1 moverotatingtileobjects 1
waitmovement 0 waitmovement 0
mossdeepgym2 turnrotatingtileobjects
waitmovement 0 waitmovement 0
mossdeepgym4 freerotatingtilepuzzle
end end
Route110_TrickHousePuzzle7_EventScript_26E347:: @ 826E347 Route110_TrickHousePuzzle7_EventScript_26E347:: @ 826E347
playse SE_MU_PACHI playse SE_MU_PACHI
waitse waitse
playse SE_TU_SAA playse SE_TU_SAA
mossdeepgym3 1 initrotatingtilepuzzle TRUE
mossdeepgym1 2 moverotatingtileobjects 2
waitmovement 0 waitmovement 0
mossdeepgym2 turnrotatingtileobjects
waitmovement 0 waitmovement 0
mossdeepgym4 freerotatingtilepuzzle
end end
Route110_TrickHousePuzzle7_EventScript_26E35D:: @ 826E35D Route110_TrickHousePuzzle7_EventScript_26E35D:: @ 826E35D
playse SE_MU_PACHI playse SE_MU_PACHI
waitse waitse
playse SE_TU_SAA playse SE_TU_SAA
mossdeepgym3 1 initrotatingtilepuzzle TRUE
mossdeepgym1 3 moverotatingtileobjects 3
waitmovement 0 waitmovement 0
mossdeepgym2 turnrotatingtileobjects
waitmovement 0 waitmovement 0
mossdeepgym4 freerotatingtilepuzzle
end end
Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373 Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373
playse SE_MU_PACHI playse SE_MU_PACHI
waitse waitse
playse SE_TU_SAA playse SE_TU_SAA
mossdeepgym3 1 initrotatingtilepuzzle TRUE
mossdeepgym1 4 moverotatingtileobjects 4
waitmovement 0 waitmovement 0
mossdeepgym2 turnrotatingtileobjects
waitmovement 0 waitmovement 0
mossdeepgym4 freerotatingtilepuzzle
end end
Route110_TrickHousePuzzle7_EventScript_26E389:: @ 826E389 Route110_TrickHousePuzzle7_EventScript_26E389:: @ 826E389
data/maps/Route113/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ Route113_MapScripts:: @ 81F2153
.byte 0 .byte 0
Route113_MapScript1_1F215E: @ 81F215E Route113_MapScript1_1F215E: @ 81F215E
setstepcallback 1 setstepcallback STEP_CB_ASH
end end
Route113_OnTransition: @ 81F2161 Route113_OnTransition: @ 81F2161
data/maps/SkyPillar_2F/scripts.inc
+1 -1
View File
@@ -15,7 +15,7 @@ SkyPillar_2F_EventScript_CleanFloor:: @ 823964C
return return
SkyPillar_2F_SetHoleWarp: @ 8239650 SkyPillar_2F_SetHoleWarp: @ 8239650
setstepcallback 7 setstepcallback STEP_CB_CRACKED_FLOOR
setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0 setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0
end end
data/maps/SkyPillar_4F/scripts.inc
+1 -1
View File
@@ -15,7 +15,7 @@ SkyPillar_4F_EventScript_CleanFloor:: @ 8239692
return return
SkyPillar_4F_SetHoleWarp: @ 8239696 SkyPillar_4F_SetHoleWarp: @ 8239696
setstepcallback 7 setstepcallback STEP_CB_CRACKED_FLOOR
setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0
end end
data/maps/SootopolisCity_Gym_1F/map.json
+4 -4
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SootopolisCity_Gym_1F_EventScript_224F44", "script": "SootopolisCity_Gym_1F_EventScript_Juan",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SootopolisCity_Gym_1F_EventScript_225040", "script": "SootopolisCity_Gym_1F_EventScript_GymGuide",
"flag": "0" "flag": "0"
} }
], ],
@@ -72,7 +72,7 @@
"y": 24, "y": 24,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SootopolisCity_Gym_1F_EventScript_22505F" "script": "SootopolisCity_Gym_1F_EventScript_LeftGymStatue"
}, },
{ {
"type": "sign", "type": "sign",
@@ -80,7 +80,7 @@
"y": 24, "y": 24,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "SootopolisCity_Gym_1F_EventScript_22506F" "script": "SootopolisCity_Gym_1F_EventScript_RightGymStatue"
} }
] ]
} }
data/maps/SootopolisCity_Gym_1F/scripts.inc
+80 -83
View File
@@ -1,7 +1,7 @@
SootopolisCity_Gym_1F_MapScripts:: @ 8224E4C SootopolisCity_Gym_1F_MapScripts:: @ 8224E4C
map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_MapScript2_224ECB map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_OnFrame
map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_MapScript1_224E67 map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_OnResume
map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_MapScript1_224E6A map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_Gym_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_Gym_1F_OnTransition
.byte 0 .byte 0
@@ -9,71 +9,68 @@ SootopolisCity_Gym_1F_OnTransition: @ 8224E61
setvar VAR_ICE_STEP_COUNT, 1 setvar VAR_ICE_STEP_COUNT, 1
end end
SootopolisCity_Gym_1F_MapScript1_224E67: @ 8224E67 SootopolisCity_Gym_1F_OnResume: @ 8224E67
setstepcallback 4 setstepcallback STEP_CB_SOOTOPOLIS_ICE
end end
SootopolisCity_Gym_1F_MapScript1_224E6A: @ 8224E6A SootopolisCity_Gym_1F_OnLoad: @ 8224E6A
call SootopolisCity_Gym_1F_EventScript_224E73 call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles
special SetSootopolisGymCrackedIceMetatiles special SetSootopolisGymCrackedIceMetatiles
end end
SootopolisCity_Gym_1F_EventScript_224E73:: @ 8224E73 SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles:: @ 8224E73
compare VAR_ICE_STEP_COUNT, 8 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 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 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, 4, METATILE_SootopolisGym_Stairs, 0
setmetatile 8, 5, METATILE_SootopolisGym_Stairs, 0 setmetatile 8, 5, METATILE_SootopolisGym_Stairs, 0
SootopolisCity_Gym_1F_EventScript_OpenFirstAndSecondStairs:: @ 8224EA6
SootopolisCity_Gym_1F_EventScript_224EA6:: @ 8224EA6
setmetatile 8, 10, METATILE_SootopolisGym_Stairs, 0 setmetatile 8, 10, METATILE_SootopolisGym_Stairs, 0
setmetatile 8, 11, METATILE_SootopolisGym_Stairs, 0 setmetatile 8, 11, METATILE_SootopolisGym_Stairs, 0
SootopolisCity_Gym_1F_EventScript_OpenFirstStairs:: @ 8224EB8
SootopolisCity_Gym_1F_EventScript_224EB8:: @ 8224EB8
setmetatile 8, 15, METATILE_SootopolisGym_Stairs, 0 setmetatile 8, 15, METATILE_SootopolisGym_Stairs, 0
setmetatile 8, 16, METATILE_SootopolisGym_Stairs, 0 setmetatile 8, 16, METATILE_SootopolisGym_Stairs, 0
SootopolisCity_Gym_1F_EventScript_StopCheckingStairs:: @ 8224ECA
SootopolisCity_Gym_1F_EventScript_224ECA:: @ 8224ECA
return return
SootopolisCity_Gym_1F_MapScript2_224ECB: @ 8224ECB SootopolisCity_Gym_1F_OnFrame: @ 8224ECB
map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_224EED 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_224F01 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_224F15 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_224F29 map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_FallThroughIce
.2byte 0 .2byte 0
SootopolisCity_Gym_1F_EventScript_224EED:: @ 8224EED SootopolisCity_Gym_1F_EventScript_UnlockFirstStairs:: @ 8224EED
addvar VAR_ICE_STEP_COUNT, 1 addvar VAR_ICE_STEP_COUNT, 1
delay 40 delay 40
playse SE_RU_GASHIN playse SE_RU_GASHIN
call SootopolisCity_Gym_1F_EventScript_224E73 call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles
special DrawWholeMapView special DrawWholeMapView
end end
SootopolisCity_Gym_1F_EventScript_224F01:: @ 8224F01 SootopolisCity_Gym_1F_EventScript_UnlockSecondStairs:: @ 8224F01
addvar VAR_ICE_STEP_COUNT, 1 addvar VAR_ICE_STEP_COUNT, 1
delay 40 delay 40
playse SE_RU_GASHIN playse SE_RU_GASHIN
call SootopolisCity_Gym_1F_EventScript_224E73 call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles
special DrawWholeMapView special DrawWholeMapView
end end
SootopolisCity_Gym_1F_EventScript_224F15:: @ 8224F15 SootopolisCity_Gym_1F_EventScript_UnlockThirdStairs:: @ 8224F15
addvar VAR_ICE_STEP_COUNT, 1 addvar VAR_ICE_STEP_COUNT, 1
delay 40 delay 40
playse SE_RU_GASHIN playse SE_RU_GASHIN
call SootopolisCity_Gym_1F_EventScript_224E73 call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles
special DrawWholeMapView special DrawWholeMapView
end end
SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29 SootopolisCity_Gym_1F_EventScript_FallThroughIce:: @ 8224F29
lockall lockall
delay 20 delay 20
applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Gym_1F_Movement_224F42 applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Gym_1F_Movement_FallThroughIce
waitmovement 0 waitmovement 0
playse SE_RU_HYUU playse SE_RU_HYUU
delay 60 delay 60
@@ -81,26 +78,26 @@ SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29
waitstate waitstate
end end
SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42 SootopolisCity_Gym_1F_Movement_FallThroughIce: @ 8224F42
set_invisible set_invisible
step_end step_end
SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 SootopolisCity_Gym_1F_EventScript_Juan:: @ 8224F44
trainerbattle_single TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82, NO_MUSIC 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 specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1 compare VAR_RESULT, TRUE
goto_if_eq SootopolisCity_Gym_1F_EventScript_225025 goto_if_eq SootopolisCity_Gym_1F_EventScript_JuanRematch
goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_224FF7 goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_GiveWaterPulse2
goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_22501B goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_GoGetFortreeBadge
msgbox SootopolisCity_Gym_1F_Text_225778, MSGBOX_DEFAULT msgbox SootopolisCity_Gym_1F_Text_JuanPostBattle, MSGBOX_DEFAULT
release release
end end
SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 SootopolisCity_Gym_1F_EventScript_JuanDefeated:: @ 8224F82
message SootopolisCity_Gym_1F_Text_225598 message SootopolisCity_Gym_1F_Text_ReceivedRainBadge
waitmessage waitmessage
call Common_EventScript_PlayGymBadgeFanfare 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_DEFEATED_SOOTOPOLIS_GYM
setflag FLAG_BADGE08_GET setflag FLAG_BADGE08_GET
setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS
@@ -110,11 +107,11 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82
clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1
setvar VAR_0x8008, 8 setvar VAR_0x8008, 8
call Common_EventScript_SetGymTrainers call Common_EventScript_SetGymTrainers
call SootopolisCity_Gym_1F_EventScript_224FD4 call SootopolisCity_Gym_1F_EventScript_GiveWaterPulse
closemessage closemessage
delay 30 delay 30
playfanfare MUS_ME_TORE_EYE playfanfare MUS_ME_TORE_EYE
msgbox SootopolisCity_Gym_1F_Text_22574D, MSGBOX_DEFAULT msgbox SootopolisCity_Gym_1F_Text_RegisteredJuan, MSGBOX_DEFAULT
waitfanfare waitfanfare
closemessage closemessage
delay 30 delay 30
@@ -122,69 +119,69 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82
release release
end end
SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 SootopolisCity_Gym_1F_EventScript_GiveWaterPulse:: @ 8224FD4
giveitem_std ITEM_TM03 giveitem_std ITEM_TM03
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Common_EventScript_BagIsFull 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 setflag FLAG_RECEIVED_TM03
return return
SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7 SootopolisCity_Gym_1F_EventScript_GiveWaterPulse2:: @ 8224FF7
giveitem_std ITEM_TM03 giveitem_std ITEM_TM03
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull 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 setflag FLAG_RECEIVED_TM03
release release
end end
SootopolisCity_Gym_1F_EventScript_22501B:: @ 822501B SootopolisCity_Gym_1F_EventScript_GoGetFortreeBadge:: @ 822501B
msgbox SootopolisCity_Gym_1F_Text_225865, MSGBOX_DEFAULT msgbox SootopolisCity_Gym_1F_Text_GoGetFortreeBadge, MSGBOX_DEFAULT
release release
end end
SootopolisCity_Gym_1F_EventScript_225025:: @ 8225025 SootopolisCity_Gym_1F_EventScript_JuanRematch:: @ 8225025
trainerbattle_rematch_double TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_225950, SootopolisCity_Gym_1F_Text_225A2E, SootopolisCity_Gym_1F_Text_225B48 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_225A67, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_1F_Text_JuanPostRematch, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_1F_EventScript_225040:: @ 8225040 SootopolisCity_Gym_1F_EventScript_GymGuide:: @ 8225040
lock lock
faceplayer faceplayer
goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_225055 goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_GymGuidePostVictory
msgbox SootopolisCity_Gym_1F_Text_225093, MSGBOX_DEFAULT msgbox SootopolisCity_Gym_1F_Text_GymGuideAdvice, MSGBOX_DEFAULT
release release
end end
SootopolisCity_Gym_1F_EventScript_225055:: @ 8225055 SootopolisCity_Gym_1F_EventScript_GymGuidePostVictory:: @ 8225055
msgbox SootopolisCity_Gym_1F_Text_2251AF, MSGBOX_DEFAULT msgbox SootopolisCity_Gym_1F_Text_GymGuidePostVictory, MSGBOX_DEFAULT
release release
end end
SootopolisCity_Gym_1F_EventScript_22505F:: @ 822505F SootopolisCity_Gym_1F_EventScript_LeftGymStatue:: @ 822505F
lockall lockall
goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_22507F goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_GymStatueCertified
goto SootopolisCity_Gym_1F_EventScript_225089 goto SootopolisCity_Gym_1F_EventScript_GymStatue
end end
SootopolisCity_Gym_1F_EventScript_22506F:: @ 822506F SootopolisCity_Gym_1F_EventScript_RightGymStatue:: @ 822506F
lockall lockall
goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_22507F goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_GymStatueCertified
goto SootopolisCity_Gym_1F_EventScript_225089 goto SootopolisCity_Gym_1F_EventScript_GymStatue
end end
SootopolisCity_Gym_1F_EventScript_22507F:: @ 822507F SootopolisCity_Gym_1F_EventScript_GymStatueCertified:: @ 822507F
msgbox SootopolisCity_Gym_1F_Text_225916, MSGBOX_DEFAULT msgbox SootopolisCity_Gym_1F_Text_GymStatueCertified, MSGBOX_DEFAULT
releaseall releaseall
end end
SootopolisCity_Gym_1F_EventScript_225089:: @ 8225089 SootopolisCity_Gym_1F_EventScript_GymStatue:: @ 8225089
msgbox SootopolisCity_Gym_1F_Text_2258FA, MSGBOX_DEFAULT msgbox SootopolisCity_Gym_1F_Text_GymStatue, MSGBOX_DEFAULT
releaseall releaseall
end end
SootopolisCity_Gym_1F_Text_225093: @ 8225093 SootopolisCity_Gym_1F_Text_GymGuideAdvice: @ 8225093
.string "Yo! How's it going, CHAMPION-\n" .string "Yo! How's it going, CHAMPION-\n"
.string "bound {PLAYER}?\p" .string "bound {PLAYER}?\p"
.string "SOOTOPOLIS's GYM LEADER JUAN is\n" .string "SOOTOPOLIS's GYM LEADER JUAN is\n"
@@ -196,14 +193,14 @@ SootopolisCity_Gym_1F_Text_225093: @ 8225093
.string "The rest of the way, you have to\n" .string "The rest of the way, you have to\n"
.string "go for it yourself!$" .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 "Yow! You've beaten even JUAN, who\n"
.string "was supposedly the best in all HOENN!\p" .string "was supposedly the best in all HOENN!\p"
.string "Okay! Check out your TRAINER CARD.\p" .string "Okay! Check out your TRAINER CARD.\p"
.string "If you've gotten all the BADGES, you're\n" .string "If you've gotten all the BADGES, you're\n"
.string "set for the POKéMON LEAGUE challenge!$" .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 "Let me ask you.\n"
.string "Did you know?\l" .string "Did you know?\l"
.string "Ah, I should not be so coy.\p" .string "Ah, I should not be so coy.\p"
@@ -226,7 +223,7 @@ SootopolisCity_Gym_1F_Text_225268: @ 8225268
@ the gDisplayedStringBattle buffer that it's put into, and it stomps all over the gBattleTextBuffs @ 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 @ 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. @ 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 "Ahahaha, excellent!\n"
.string "Very well, you are the winner.\p" .string "Very well, you are the winner.\p"
.string "From you, I sense the brilliant shine\n" .string "From you, I sense the brilliant shine\n"
@@ -241,11 +238,11 @@ SootopolisCity_Gym_1F_Text_225432: @ 8225432
.string "Rather than my clothes, I shall reward\n" .string "Rather than my clothes, I shall reward\n"
.string "you with this, the RAIN BADGE!$" .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 "{PLAYER} received the RAIN BADGE\n"
.string "from JUAN.$" .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 "Having the RAIN BADGE shall assure you\n"
.string "the full obedience of all your POKéMON\l" .string "the full obedience of all your POKéMON\l"
.string "to your every command.\p" .string "to your every command.\p"
@@ -255,18 +252,18 @@ SootopolisCity_Gym_1F_Text_2255BE: @ 82255BE
.string "And, so that you never forget the\n" .string "And, so that you never forget the\n"
.string "battle we shared, take this…$" .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 "The TECHNICAL MACHINE I handed you\n"
.string "contains WATER PULSE.\p" .string "contains WATER PULSE.\p"
.string "In use, it will occasionally confuse\n" .string "In use, it will occasionally confuse\n"
.string "the target with ultrasonic waves.\p" .string "the target with ultrasonic waves.\p"
.string "… … … … … …$" .string "… … … … … …$"
SootopolisCity_Gym_1F_Text_22574D: @ 822574D SootopolisCity_Gym_1F_Text_RegisteredJuan: @ 822574D
.string "Registered GYM LEADER JUAN\n" .string "Registered GYM LEADER JUAN\n"
.string "in the POKéNAV.$" .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 TRAINERS who have gathered all\n"
.string "the GYM BADGES of HOENN should make\l" .string "the GYM BADGES of HOENN should make\l"
.string "way to the ultimate destination.\p" .string "way to the ultimate destination.\p"
@@ -276,22 +273,22 @@ SootopolisCity_Gym_1F_Text_225778: @ 8225778
.string "There, you shall find the POKéMON\n" .string "There, you shall find the POKéMON\n"
.string "LEAGUE.$" .string "LEAGUE.$"
SootopolisCity_Gym_1F_Text_225865: @ 8225865 SootopolisCity_Gym_1F_Text_GoGetFortreeBadge: @ 8225865
.string "There remains but one BADGE to\n" .string "There remains but one BADGE to\n"
.string "obtain in HOENN.\p" .string "obtain in HOENN.\p"
.string "If you wish to challenge the POKéMON\n" .string "If you wish to challenge the POKéMON\n"
.string "LEAGUE, you must obtain the last\l" .string "LEAGUE, you must obtain the last\l"
.string "BADGE from the GYM in FORTREE.$" .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$" .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 "SOOTOPOLIS CITY POKéMON GYM\p"
.string "JUAN'S CERTIFIED TRAINERS:\n" .string "JUAN'S CERTIFIED TRAINERS:\n"
.string "{PLAYER}$" .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 "JUAN: Ah, this GYM had returned to its\n"
.string "usual state of serenity…\p" .string "usual state of serenity…\p"
.string "But our young typhoon has returned\n" .string "But our young typhoon has returned\n"
@@ -300,11 +297,11 @@ SootopolisCity_Gym_1F_Text_225950: @ 8225950
.string "I shall be delighted to dance with you\n" .string "I shall be delighted to dance with you\n"
.string "as often as you wish!$" .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 "Ahahaha, you are the winner!\n"
.string "You have defeated me again!$" .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 "JUAN: If I told you to become my\n"
.string "apprentice, you will refuse, I am sure.\p" .string "apprentice, you will refuse, I am sure.\p"
.string "I would like to make a gift of my coat\n" .string "I would like to make a gift of my coat\n"
@@ -314,7 +311,7 @@ SootopolisCity_Gym_1F_Text_225A67: @ 8225A67
.string "And that, my friend, is a certain sign\n" .string "And that, my friend, is a certain sign\n"
.string "of nobility!$" .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 "JUAN: Ah, this GYM had returned to its\n"
.string "usual state of serenity…\p" .string "usual state of serenity…\p"
.string "But our young typhoon has returned\n" .string "But our young typhoon has returned\n"
data/maps/SootopolisCity_Gym_B1F/map.json
+10 -10
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "SootopolisCity_Gym_B1F_EventScript_225C8B", "script": "SootopolisCity_Gym_B1F_EventScript_Andrea",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "SootopolisCity_Gym_B1F_EventScript_225CD0", "script": "SootopolisCity_Gym_B1F_EventScript_Connie",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "1",
"script": "SootopolisCity_Gym_B1F_EventScript_225CB9", "script": "SootopolisCity_Gym_B1F_EventScript_Brianna",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5", "trainer_sight_or_berry_tree_id": "5",
"script": "SootopolisCity_Gym_B1F_EventScript_225CE7", "script": "SootopolisCity_Gym_B1F_EventScript_Bridget",
"flag": "0" "flag": "0"
}, },
{ {
@@ -76,7 +76,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4", "trainer_sight_or_berry_tree_id": "4",
"script": "SootopolisCity_Gym_B1F_EventScript_225D15", "script": "SootopolisCity_Gym_B1F_EventScript_Tiffany",
"flag": "0" "flag": "0"
}, },
{ {
@@ -89,7 +89,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2", "trainer_sight_or_berry_tree_id": "2",
"script": "SootopolisCity_Gym_B1F_EventScript_225D2C", "script": "SootopolisCity_Gym_B1F_EventScript_Bethany",
"flag": "0" "flag": "0"
}, },
{ {
@@ -102,7 +102,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2", "trainer_sight_or_berry_tree_id": "2",
"script": "SootopolisCity_Gym_B1F_EventScript_225CA2", "script": "SootopolisCity_Gym_B1F_EventScript_Crissy",
"flag": "0" "flag": "0"
}, },
{ {
@@ -115,7 +115,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3", "trainer_sight_or_berry_tree_id": "3",
"script": "SootopolisCity_Gym_B1F_EventScript_225CFE", "script": "SootopolisCity_Gym_B1F_EventScript_Olivia",
"flag": "0" "flag": "0"
}, },
{ {
@@ -128,7 +128,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3", "trainer_sight_or_berry_tree_id": "3",
"script": "SootopolisCity_Gym_B1F_EventScript_225D5A", "script": "SootopolisCity_Gym_B1F_EventScript_Daphne",
"flag": "0" "flag": "0"
}, },
{ {
@@ -141,7 +141,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "1", "trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3", "trainer_sight_or_berry_tree_id": "3",
"script": "SootopolisCity_Gym_B1F_EventScript_225D43", "script": "SootopolisCity_Gym_B1F_EventScript_Annika",
"flag": "0" "flag": "0"
} }
], ],
data/maps/SootopolisCity_Gym_B1F/scripts.inc
+60 -60
View File
@@ -1,183 +1,183 @@
SootopolisCity_Gym_B1F_MapScripts:: @ 8225C8A SootopolisCity_Gym_B1F_MapScripts:: @ 8225C8A
.byte 0 .byte 0
SootopolisCity_Gym_B1F_EventScript_225C8B:: @ 8225C8B SootopolisCity_Gym_B1F_EventScript_Andrea:: @ 8225C8B
trainerbattle_single TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_225D71, SootopolisCity_Gym_B1F_Text_225DB6 trainerbattle_single TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_AndreaPreBattle, SootopolisCity_Gym_B1F_Text_AndreaDefeat
msgbox SootopolisCity_Gym_B1F_Text_225DCF, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_AndreaPostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_EventScript_225CA2:: @ 8225CA2 SootopolisCity_Gym_B1F_EventScript_Crissy:: @ 8225CA2
trainerbattle_single TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_225E04, SootopolisCity_Gym_B1F_Text_225E60 trainerbattle_single TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_CrissyPreBattle, SootopolisCity_Gym_B1F_Text_CrissyDefeat
msgbox SootopolisCity_Gym_B1F_Text_225E90, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_CrissyPostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_EventScript_225CB9:: @ 8225CB9 SootopolisCity_Gym_B1F_EventScript_Brianna:: @ 8225CB9
trainerbattle_single TRAINER_BRIANNA, SootopolisCity_Gym_B1F_Text_22646E, SootopolisCity_Gym_B1F_Text_226495 trainerbattle_single TRAINER_BRIANNA, SootopolisCity_Gym_B1F_Text_BriannaPreBattle, SootopolisCity_Gym_B1F_Text_BriannaDefeat
msgbox SootopolisCity_Gym_B1F_Text_2264BC, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_BriannaPostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_EventScript_225CD0:: @ 8225CD0 SootopolisCity_Gym_B1F_EventScript_Connie:: @ 8225CD0
trainerbattle_single TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_225FBE, SootopolisCity_Gym_B1F_Text_225FEB trainerbattle_single TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_ConniePreBattle, SootopolisCity_Gym_B1F_Text_ConnieDefeat
msgbox SootopolisCity_Gym_B1F_Text_225FFE, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_ConniePostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_EventScript_225CE7:: @ 8225CE7 SootopolisCity_Gym_B1F_EventScript_Bridget:: @ 8225CE7
trainerbattle_single TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_226061, SootopolisCity_Gym_B1F_Text_2260B6 trainerbattle_single TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_BridgetPreBattle, SootopolisCity_Gym_B1F_Text_BridgetDefeat
msgbox SootopolisCity_Gym_B1F_Text_2260D1, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_BridgetPostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_EventScript_225CFE:: @ 8225CFE SootopolisCity_Gym_B1F_EventScript_Olivia:: @ 8225CFE
trainerbattle_single TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_226164, SootopolisCity_Gym_B1F_Text_2261A7 trainerbattle_single TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_OliviaPreBattle, SootopolisCity_Gym_B1F_Text_OliviaDefeat
msgbox SootopolisCity_Gym_B1F_Text_2261B5, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_OliviaPostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_EventScript_225D15:: @ 8225D15 SootopolisCity_Gym_B1F_EventScript_Tiffany:: @ 8225D15
trainerbattle_single TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_2261F7, SootopolisCity_Gym_B1F_Text_226274 trainerbattle_single TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_TiffanyPreBattle, SootopolisCity_Gym_B1F_Text_TiffanyDefeat
msgbox SootopolisCity_Gym_B1F_Text_226286, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_TiffanyPostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_EventScript_225D2C:: @ 8225D2C SootopolisCity_Gym_B1F_EventScript_Bethany:: @ 8225D2C
trainerbattle_single TRAINER_BETHANY, SootopolisCity_Gym_B1F_Text_2262F3, SootopolisCity_Gym_B1F_Text_22633B trainerbattle_single TRAINER_BETHANY, SootopolisCity_Gym_B1F_Text_BethanyPreBattle, SootopolisCity_Gym_B1F_Text_BethanyDefeat
msgbox SootopolisCity_Gym_B1F_Text_226341, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_BethanyPostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_EventScript_225D43:: @ 8225D43 SootopolisCity_Gym_B1F_EventScript_Annika:: @ 8225D43
trainerbattle_single TRAINER_ANNIKA, SootopolisCity_Gym_B1F_Text_226388, SootopolisCity_Gym_B1F_Text_2263BD trainerbattle_single TRAINER_ANNIKA, SootopolisCity_Gym_B1F_Text_AnnikaPreBattle, SootopolisCity_Gym_B1F_Text_AnnikaDefeat
msgbox SootopolisCity_Gym_B1F_Text_2263F4, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_AnnikaPostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_EventScript_225D5A:: @ 8225D5A SootopolisCity_Gym_B1F_EventScript_Daphne:: @ 8225D5A
trainerbattle_single TRAINER_DAPHNE, SootopolisCity_Gym_B1F_Text_225ED6, SootopolisCity_Gym_B1F_Text_225F35 trainerbattle_single TRAINER_DAPHNE, SootopolisCity_Gym_B1F_Text_DaphnePreBattle, SootopolisCity_Gym_B1F_Text_DaphneDefeat
msgbox SootopolisCity_Gym_B1F_Text_225F67, MSGBOX_AUTOCLOSE msgbox SootopolisCity_Gym_B1F_Text_DaphnePostBattle, MSGBOX_AUTOCLOSE
end end
SootopolisCity_Gym_B1F_Text_225D71: @ 8225D71 SootopolisCity_Gym_B1F_Text_AndreaPreBattle: @ 8225D71
.string "I'll show you the sublime techniques\n" .string "I'll show you the sublime techniques\n"
.string "I learned from our LEADER JUAN!$" .string "I learned from our LEADER JUAN!$"
SootopolisCity_Gym_B1F_Text_225DB6: @ 8225DB6 SootopolisCity_Gym_B1F_Text_AndreaDefeat: @ 8225DB6
.string "Please forgive me, JUAN…$" .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 "Watch what happens if you crack all\n"
.string "the floor tiles.$" .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 "You came all the way here, but you won't\n"
.string "get to see JUAN.\p" .string "get to see JUAN.\p"
.string "Not if you lose to me, you won't!$" .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 "You're strong!\n"
.string "I was fooled by your cute looks!$" .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 "You might be good enough to avoid\n"
.string "being wiped out in one hit by JUAN.$" .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 "The sight of JUAN conducting\n"
.string "a battle…\p" .string "a battle…\p"
.string "The very beauty of it compelled me to\n" .string "The very beauty of it compelled me to\n"
.string "become a TRAINER.$" .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 "You battled with more beauty than\n"
.string "I could muster…$" .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 "The grace you bring to battle is\n"
.string "fabulous.\p" .string "fabulous.\p"
.string "Oh… I'm so fortunate to have found\n" .string "Oh… I'm so fortunate to have found\n"
.string "POKéMON.$" .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 "I should teach you how harsh battles\n"
.string "can be.$" .string "can be.$"
SootopolisCity_Gym_B1F_Text_225FEB: @ 8225FEB SootopolisCity_Gym_B1F_Text_ConnieDefeat: @ 8225FEB
.string "Oh.\n" .string "Oh.\n"
.string "You're strong.$" .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 "I'll tell you something good.\p"
.string "If you want to reach JUAN, you\n" .string "If you want to reach JUAN, you\n"
.string "need to walk on each floor tile once.$" .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 "The POKéMON GYM of the highest level\n"
.string "in the HOENN region…\p" .string "in the HOENN region…\p"
.string "That's the SOOTOPOLIS GYM.$" .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!$" .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 "Rather than being satisfied by being\n"
.string "in a strong GYM, I imagine training in\l" .string "in a strong GYM, I imagine training in\l"
.string "other places will make you stronger.\l" .string "other places will make you stronger.\l"
.string "But above all, it looks more fun.$" .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 "I train my POKéMON together with\n"
.string "JUAN.\p" .string "JUAN.\p"
.string "Don't think I'm a pushover.$" .string "Don't think I'm a pushover.$"
SootopolisCity_Gym_B1F_Text_2261A7: @ 82261A7 SootopolisCity_Gym_B1F_Text_OliviaDefeat: @ 82261A7
.string "I was beaten…$" .string "I was beaten…$"
SootopolisCity_Gym_B1F_Text_2261B5: @ 82261B5 SootopolisCity_Gym_B1F_Text_OliviaPostBattle: @ 82261B5
.string "I think you have potential.\n" .string "I think you have potential.\n"
.string "Why don't you stay and train with us?$" .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 "A graceful glide across the ice while\n"
.string "crossing no lines…\p" .string "crossing no lines…\p"
.string "A TRAINER putting on that performance\n" .string "A TRAINER putting on that performance\n"
.string "would be elegantly beautiful!$" .string "would be elegantly beautiful!$"
SootopolisCity_Gym_B1F_Text_226274: @ 8226274 SootopolisCity_Gym_B1F_Text_TiffanyDefeat: @ 8226274
.string "Well, excuse me?!$" .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 "This is really obvious, but how strong\n"
.string "you are as a TRAINER has nothing to do\l" .string "you are as a TRAINER has nothing to do\l"
.string "with how young or old you are.$" .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 "When I'm with my POKéMON, the time\n"
.string "flies by before you can say, “Oops!”$" .string "flies by before you can say, “Oops!”$"
SootopolisCity_Gym_B1F_Text_22633B: @ 822633B SootopolisCity_Gym_B1F_Text_BethanyDefeat: @ 822633B
.string "Oops!$" .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 "I wish I could forget about lost causes\n"
.string "before I can manage an “Oops!”$" .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 "I can battle with really rare POKéMON\n"
.string "if you'd like.$" .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 "Oh, there now! Did you have a good look\n"
.string "at my POKéMON?$" .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 "I came to this GYM because JUAN\n"
.string "praised me for my darling POKéMON.\p" .string "praised me for my darling POKéMON.\p"
.string "Oh, if only I'd met JUAN years ago\n" .string "Oh, if only I'd met JUAN years ago\n"
.string "when I was younger…$" .string "when I was younger…$"
SootopolisCity_Gym_B1F_Text_22646E: @ 822646E SootopolisCity_Gym_B1F_Text_BriannaPreBattle: @ 822646E
.string "Giggle…\n" .string "Giggle…\n"
.string "Your grim look is so charming.$" .string "Your grim look is so charming.$"
SootopolisCity_Gym_B1F_Text_226495: @ 8226495 SootopolisCity_Gym_B1F_Text_BriannaDefeat: @ 8226495
.string "Oh, dear.\n" .string "Oh, dear.\n"
.string "I went much too easy on you.$" .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 "You couldn't lay a finger on JUAN,\n"
.string "I'm sure. Giggle…$" .string "I'm sure. Giggle…$"
data/mossdeep_gym.s → data/rotating_tile_puzzle.s
+8 -8
View File
@@ -2,42 +2,42 @@
.section .rodata .section .rodata
gUnknown_08612698:: @ 8612698 RotatingTilePuzzle_Movement_ShiftRight:: @ 8612698
store_lock_anim store_lock_anim
walk_right walk_right
free_unlock_anim free_unlock_anim
step_end step_end
gUnknown_0861269C:: @ 861269C RotatingTilePuzzle_Movement_ShiftDown:: @ 861269C
store_lock_anim store_lock_anim
walk_down walk_down
free_unlock_anim free_unlock_anim
step_end step_end
gUnknown_086126A0:: @ 86126A0 RotatingTilePuzzle_Movement_ShiftLeft:: @ 86126A0
store_lock_anim store_lock_anim
walk_left walk_left
free_unlock_anim free_unlock_anim
step_end step_end
gUnknown_086126A4:: @ 86126A4 RotatingTilePuzzle_Movement_ShiftUp:: @ 86126A4
store_lock_anim store_lock_anim
walk_up walk_up
free_unlock_anim free_unlock_anim
step_end step_end
gUnknown_086126A8:: @ 86126A8 RotatingTilePuzzle_Movement_FaceRight:: @ 86126A8
face_right face_right
step_end step_end
gUnknown_086126AA:: @ 86126AA RotatingTilePuzzle_Movement_FaceDown:: @ 86126AA
face_down face_down
step_end step_end
gUnknown_086126AC:: @ 86126AC RotatingTilePuzzle_Movement_FaceLeft:: @ 86126AC
face_left face_left
step_end step_end
gUnknown_086126AE:: @ 86126AE RotatingTilePuzzle_Movement_FaceUp:: @ 86126AE
face_up face_up
step_end step_end
data/script_cmd_table.inc
+5 -5
View File
@@ -211,11 +211,11 @@ gScriptCmdTable:: @ 81DB67C
.4byte ScrCmd_nop1 .4byte ScrCmd_nop1
.4byte ScrCmd_warpD1 .4byte ScrCmd_warpD1
.4byte ScrCmd_setmonmetlocation .4byte ScrCmd_setmonmetlocation
.4byte ScrCmd_mossdeepgym1 .4byte ScrCmd_moverotatingtileobjects
.4byte ScrCmd_mossdeepgym2 .4byte ScrCmd_turnrotatingtileobjects
.4byte ScrCmd_mossdeepgym3 .4byte ScrCmd_initrotatingtilepuzzle
.4byte ScrCmd_mossdeepgym4 .4byte ScrCmd_freerotatingtilepuzzle
.4byte ScrCmd_warpD7 .4byte ScrCmd_warpmossdeepgym
.4byte ScrCmd_cmdD8 .4byte ScrCmd_cmdD8
.4byte ScrCmd_cmdD9 .4byte ScrCmd_cmdD9
.4byte ScrCmd_cmdDA .4byte ScrCmd_cmdDA
data/scripts/shared_secret_base.inc
+1 -1
View File
@@ -20,7 +20,7 @@ SecretBase_MapScript2_OnFrame: @ 823B4AE
.2byte 0 .2byte 0
SecretBase_MapScript1_OnResume: @ 823B4B8 SecretBase_MapScript1_OnResume: @ 823B4B8
setstepcallback 6 setstepcallback STEP_CB_SECRET_BASE
end end
SecretBase_EventScript_PC:: @ 823B4BB SecretBase_EventScript_PC:: @ 823B4BB
data/specials.inc
+2 -2
View File
@@ -156,8 +156,8 @@ gSpecials:: @ 81DBA64
def_special DrawWholeMapView def_special DrawWholeMapView
def_special StorePlayerCoordsInVars def_special StorePlayerCoordsInVars
def_special MauvilleGymDeactivatePuzzle def_special MauvilleGymDeactivatePuzzle
def_special PetalburgGymSpecial1 def_special PetalburgGymSlideOpenRoomDoors
def_special PetalburgGymSpecial2 def_special PetalburgGymUnlockRoomDoors
def_special GetPlayerTrainerIdOnesDigit def_special GetPlayerTrainerIdOnesDigit
def_special GetPlayerBigGuyGirlString def_special GetPlayerBigGuyGirlString
def_special GetRivalSonDaughterString def_special GetRivalSonDaughterString
data/text/berries.inc
+1 -1
View File
@@ -1,4 +1,4 @@
PetalburgCity_Gym_Text_2A6D3D: @ 82A6D3D PetalburgCity_Gym_Text_GiveEnigmaBerry: @ 82A6D3D
.string "DAD: Hi, {PLAYER}!\p" .string "DAD: Hi, {PLAYER}!\p"
.string "I just received a very rare BERRY.\n" .string "I just received a very rare BERRY.\n"
.string "I'd like you to have it.$" .string "I'd like you to have it.$"
include/constants/field_tasks.h
+13
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
include/constants/flags.h
+5 -5
View File
@@ -109,10 +109,10 @@
#define FLAG_MET_TEAM_AQUA_HARBOR 0x61 #define FLAG_MET_TEAM_AQUA_HARBOR 0x61
#define FLAG_TV_EXPLAINED 0x62 #define FLAG_TV_EXPLAINED 0x62
#define FLAG_MAUVILLE_GYM_BARRIERS_STATE 0x63 #define FLAG_MAUVILLE_GYM_BARRIERS_STATE 0x63
#define FLAG_MOSSDEEP_GYM_SWITCH_1 0x64 #define FLAG_MOSSDEEP_GYM_SWITCH_1 0x64 // Leftover from the RS version of Mossdeep Gym, functionally unused
#define FLAG_MOSSDEEP_GYM_SWITCH_2 0x65 #define FLAG_MOSSDEEP_GYM_SWITCH_2 0x65 //
#define FLAG_MOSSDEEP_GYM_SWITCH_3 0x66 #define FLAG_MOSSDEEP_GYM_SWITCH_3 0x66 //
#define FLAG_MOSSDEEP_GYM_SWITCH_4 0x67 #define FLAG_MOSSDEEP_GYM_SWITCH_4 0x67 //
#define FLAG_UNUSED_0x068 0x68 // Unused Flag #define FLAG_UNUSED_0x068 0x68 // Unused Flag
@@ -1549,7 +1549,7 @@
// Special Flags (Unknown) // Special Flags (Unknown)
#define SPECIAL_FLAGS_START 0x4000 #define SPECIAL_FLAGS_START 0x4000
#define FLAG_HIDE_MAP_NAME_POPUP 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_0x4002 0x4002
#define FLAG_SPECIAL_FLAG_0x4003 0x4003 #define FLAG_SPECIAL_FLAG_0x4003 0x4003
#define FLAG_SPECIAL_FLAG_0x4004 0x4004 #define FLAG_SPECIAL_FLAG_0x4004 0x4004
include/constants/metatile_labels.h
+11 -7
View File
@@ -68,13 +68,16 @@
#define METATILE_PetalburgGym_SlidingDoor_Frame3 0x21B #define METATILE_PetalburgGym_SlidingDoor_Frame3 0x21B
#define METATILE_PetalburgGym_SlidingDoor_Frame4 0x21C #define METATILE_PetalburgGym_SlidingDoor_Frame4 0x21C
// gTileset_MossdeepGym // gTileset_MossdeepGym from R/S
#define METATILE_MossdeepGym_Obelisk_Top 0x204 #define METATILE_RS_MossdeepGym_RedArrow_Right 0x204
#define METATILE_MossdeepGym_Obelisk_Base 0x20C #define METATILE_RS_MossdeepGym_RedArrow_Left 0x20C
#define METATILE_MossdeepGym_Wall_LeftCorner 0x20D #define METATILE_RS_MossdeepGym_RedArrow_Up 0x20D
#define METATILE_MossdeepGym_OuterWall_RightCorner 0x205 #define METATILE_RS_MossdeepGym_RedArrow_Down 0x205
#define METATILE_MossdeepGym_Empty0 0x238 #define METATILE_RS_MossdeepGym_Switch_Up 0x238
#define METATILE_MossdeepGym_Empty1 0x239 #define METATILE_RS_MossdeepGym_Switch_Down 0x239
// gTileset_MossdeepGym from Emerald
#define METATILE_MossdeepGym_YellowArrow_Right 0x250
// gTileset_BrendansMaysHouse // gTileset_BrendansMaysHouse
#define METATILE_BrendansMaysHouse_BrendanPC_Off 0x25A #define METATILE_BrendansMaysHouse_BrendanPC_Off 0x25A
@@ -376,6 +379,7 @@
#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down 0x263 #define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down 0x263
#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt 0x27B #define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt 0x27B
#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt 0x27C #define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt 0x27C
#define METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right 0x298
// gTileset_BikeShop // gTileset_BikeShop
#define METATILE_BikeShop_Barrier_Hidden_Top 0x269 #define METATILE_BikeShop_Barrier_Hidden_Top 0x269
include/constants/vars.h
+1 -1
View File
@@ -147,7 +147,7 @@
#define VAR_LITTLEROOT_HOUSES_STATE 0x4082 #define VAR_LITTLEROOT_HOUSES_STATE 0x4082
#define VAR_UNUSED_0x4083 0x4083 // Unused Var #define VAR_UNUSED_0x4083 0x4083 // Unused Var
#define VAR_BIRCH_LAB_STATE 0x4084 #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_LINK_CONTEST_ROOM_STATE 0x4086
#define VAR_CABLE_CLUB_STATE 0x4087 #define VAR_CABLE_CLUB_STATE 0x4087
#define VAR_CONTEST_LOCATION 0x4088 #define VAR_CONTEST_LOCATION 0x4088
include/field_screen_effect.h
+1 -1
View File
@@ -28,7 +28,7 @@ void sub_80AF80C(u8 metatileBehavior);
void sub_80AF828(void); void sub_80AF828(void);
void sub_80AF838(void); void sub_80AF838(void);
void sub_80AF848(void); void sub_80AF848(void);
void sub_80AF87C(void); void DoMossdeepGymWarp(void);
void sub_80AF8B8(void); void sub_80AF8B8(void);
void sub_80AF948(void); void sub_80AF948(void);
void sub_80AF9F8(void); void sub_80AF9F8(void);
include/mossdeep_gym.h
-9
View File
@@ -1,9 +0,0 @@
#ifndef GUARD_MOSSDEEP_GYM_H
#define GUARD_MOSSDEEP_GYM_H
void InitMossdeepGymTiles(bool8 arg0);
void FinishMossdeepGymTiles(void);
u16 MossdeepGym_MoveEvents(u8 arg0);
void MossdeepGym_TurnEvents(void);
#endif // GUARD_MOSSDEEP_GYM_H
include/rotating_tile_puzzle.h
+9
View File
@@ -0,0 +1,9 @@
#ifndef GUARD_ROTATING_TILE_PUZZLE_H
#define GUARD_ROTATING_TILE_PUZZLE_H
void InitRotatingTilePuzzle(bool8 isTrickHouse);
void FreeRotatingTilePuzzle(void);
u16 MoveRotatingTileObjects(u8 puzzleNumber);
void TurnRotatingTileObjects(void);
#endif // GUARD_ROTATING_TILE_PUZZLE_H
ld_script.txt
+3 -3
View File
@@ -287,7 +287,7 @@ SECTIONS {
src/battle_arena.o(.text); src/battle_arena.o(.text);
src/battle_factory.o(.text); src/battle_factory.o(.text);
src/battle_pike.o(.text); src/battle_pike.o(.text);
src/mossdeep_gym.o(.text); src/rotating_tile_puzzle.o(.text);
src/battle_pyramid.o(.text); src/battle_pyramid.o(.text);
src/item_menu.o(.text); src/item_menu.o(.text);
src/list_menu.o(.text); src/list_menu.o(.text);
@@ -644,8 +644,8 @@ SECTIONS {
src/battle_arena.o(.rodata); src/battle_arena.o(.rodata);
src/battle_factory.o(.rodata); src/battle_factory.o(.rodata);
src/battle_pike.o(.rodata); src/battle_pike.o(.rodata);
src/mossdeep_gym.o(.rodata); src/rotating_tile_puzzle.o(.rodata);
data/mossdeep_gym.o(.rodata); data/rotating_tile_puzzle.o(.rodata);
src/battle_pyramid.o(.rodata); src/battle_pyramid.o(.rodata);
src/item_menu.o(.rodata); src/item_menu.o(.rodata);
src/list_menu.o(.rodata); src/list_menu.o(.rodata);
src/field_control_avatar.c
+1 -1
View File
@@ -738,7 +738,7 @@ static bool8 TryStartWarpEventScript(struct MapPosition *position, u16 metatileB
} }
if (MetatileBehavior_IsMossdeepGymWarp(metatileBehavior) == TRUE) if (MetatileBehavior_IsMossdeepGymWarp(metatileBehavior) == TRUE)
{ {
sub_80AF87C(); DoMossdeepGymWarp();
return TRUE; return TRUE;
} }
DoWarp(); DoWarp();
src/field_screen_effect.c
+1 -1
View File
@@ -556,7 +556,7 @@ void sub_80AF848(void)
gFieldCallback = sub_80AF3E8; gFieldCallback = sub_80AF3E8;
} }
void sub_80AF87C(void) void DoMossdeepGymWarp(void)
{ {
sub_8085540(1); sub_8085540(1);
ScriptContext2_Enable(); ScriptContext2_Enable();
src/field_special_scene.c
+2 -2
View File
@@ -302,7 +302,7 @@ void Task_HandlePorthole(u8 taskId)
} }
break; break;
case EXIT_PORTHOLE: // exit porthole. case EXIT_PORTHOLE: // exit porthole.
FlagClear(FLAG_SPECIAL_FLAG_0x4001); FlagClear(FLAG_DONT_TRANSITION_MUSIC);
FlagClear(FLAG_HIDE_MAP_NAME_POPUP); FlagClear(FLAG_HIDE_MAP_NAME_POPUP);
SetWarpDestinationToDynamicWarp(0); SetWarpDestinationToDynamicWarp(0);
DoDiveWarp(); DoDiveWarp();
@@ -339,7 +339,7 @@ void sub_80FB768(void)
void sub_80FB7A4(void) void sub_80FB7A4(void)
{ {
FlagSet(FLAG_SYS_CRUISE_MODE); FlagSet(FLAG_SYS_CRUISE_MODE);
FlagSet(FLAG_SPECIAL_FLAG_0x4001); FlagSet(FLAG_DONT_TRANSITION_MUSIC);
FlagSet(FLAG_HIDE_MAP_NAME_POPUP); FlagSet(FLAG_HIDE_MAP_NAME_POPUP);
SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
sub_80FB59C(); sub_80FB59C();
src/field_specials.c
+18 -18
View File
@@ -69,8 +69,8 @@
EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE; EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE;
EWRAM_DATA u8 gBikeCollisions = 0; EWRAM_DATA u8 gBikeCollisions = 0;
static EWRAM_DATA u32 sBikeCyclingTimer = 0; static EWRAM_DATA u32 sBikeCyclingTimer = 0;
static EWRAM_DATA u8 sUnknown_0203AB5C = 0; static EWRAM_DATA u8 sSlidingDoorNextFrameCounter = 0;
static EWRAM_DATA u8 sPetalburgGymSlidingDoorFrameCounter = 0; static EWRAM_DATA u8 sSlidingDoorFrame = 0;
static EWRAM_DATA u8 sTutorMoveAndElevatorWindowId = 0; static EWRAM_DATA u8 sTutorMoveAndElevatorWindowId = 0;
static EWRAM_DATA u16 sLilycoveDeptStore_NeverRead = 0; static EWRAM_DATA u16 sLilycoveDeptStore_NeverRead = 0;
static EWRAM_DATA u16 sLilycoveDeptStore_DefaultFloorChoice = 0; static EWRAM_DATA u16 sLilycoveDeptStore_DefaultFloorChoice = 0;
@@ -96,8 +96,8 @@ u16 GetNumMovedLilycoveFanClubMembers(void);
static void RecordCyclingRoadResults(u32, u8); static void RecordCyclingRoadResults(u32, u8);
static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum); static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum);
static void Task_PetalburgGym(u8); static void Task_PetalburgGymSlideOpenRoomDoors(u8 taskId);
static void PetalburgGymFunc(u8, u16); static void PetalburgGymSetDoorMetatiles(u8 roomNumber, u16 metatileId);
static void Task_PCTurnOnEffect(u8); static void Task_PCTurnOnEffect(u8);
static void PCTurnOnEffect_0(struct Task *); static void PCTurnOnEffect_0(struct Task *);
static void PCTurnOnEffect_1(s16, s8, s8); static void PCTurnOnEffect_1(s16, s8, s8);
@@ -810,7 +810,7 @@ void MauvilleGymDeactivatePuzzle(void)
} }
} }
static const u8 gUnknown_085B2B78[] = {0, 1, 1, 1, 1}; static const bool8 sSlidingDoorNextFrameDelay[] = {0, 1, 1, 1, 1};
static const u16 sPetalburgGymSlidingDoorMetatiles[] = { static const u16 sPetalburgGymSlidingDoorMetatiles[] = {
METATILE_ID(PetalburgGym, SlidingDoor_Frame0), METATILE_ID(PetalburgGym, SlidingDoor_Frame0),
@@ -820,21 +820,21 @@ static const u16 sPetalburgGymSlidingDoorMetatiles[] = {
METATILE_ID(PetalburgGym, SlidingDoor_Frame4), METATILE_ID(PetalburgGym, SlidingDoor_Frame4),
}; };
void PetalburgGymSpecial1(void) void PetalburgGymSlideOpenRoomDoors(void)
{ {
sUnknown_0203AB5C = 0; sSlidingDoorNextFrameCounter = 0;
sPetalburgGymSlidingDoorFrameCounter = 0; sSlidingDoorFrame = 0;
PlaySE(SE_KI_GASYAN); 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]); PetalburgGymSetDoorMetatiles(gSpecialVar_0x8004, sPetalburgGymSlidingDoorMetatiles[sSlidingDoorFrame]);
sUnknown_0203AB5C = 0; sSlidingDoorNextFrameCounter = 0;
if ((++sPetalburgGymSlidingDoorFrameCounter) == ARRAY_COUNT(sPetalburgGymSlidingDoorMetatiles)) if ((++sSlidingDoorFrame) == ARRAY_COUNT(sPetalburgGymSlidingDoorMetatiles))
{ {
DestroyTask(taskId); DestroyTask(taskId);
EnableBothScriptContexts(); EnableBothScriptContexts();
@@ -842,11 +842,11 @@ static void Task_PetalburgGym(u8 taskId)
} }
else else
{ {
sUnknown_0203AB5C++; sSlidingDoorNextFrameCounter++;
} }
} }
static void PetalburgGymFunc(u8 roomNumber, u16 metatileId) static void PetalburgGymSetDoorMetatiles(u8 roomNumber, u16 metatileId)
{ {
u16 doorCoordsX[4]; u16 doorCoordsX[4];
u16 doorCoordsY[4]; u16 doorCoordsY[4];
@@ -911,9 +911,9 @@ static void PetalburgGymFunc(u8 roomNumber, u16 metatileId)
DrawWholeMapView(); DrawWholeMapView();
} }
void PetalburgGymSpecial2(void) void PetalburgGymUnlockRoomDoors(void)
{ {
PetalburgGymFunc(gSpecialVar_0x8004, sPetalburgGymSlidingDoorMetatiles[4]); PetalburgGymSetDoorMetatiles(gSpecialVar_0x8004, sPetalburgGymSlidingDoorMetatiles[4]);
} }
void ShowFieldMessageStringVar4(void) void ShowFieldMessageStringVar4(void)
src/field_tasks.c
+9 -8
View File
@@ -16,6 +16,7 @@
#include "secret_base.h" #include "secret_base.h"
#include "sound.h" #include "sound.h"
#include "task.h" #include "task.h"
#include "constants/field_tasks.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/vars.h" #include "constants/vars.h"
@@ -38,14 +39,14 @@ static void Task_MuddySlope(u8 taskId);
static const TaskFunc sPerStepCallbacks[] = static const TaskFunc sPerStepCallbacks[] =
{ {
DummyPerStepCallback, [STEP_CB_DUMMY] = DummyPerStepCallback,
AshGrassPerStepCallback, [STEP_CB_ASH] = AshGrassPerStepCallback,
FortreeBridgePerStepCallback, [STEP_CB_FORTREE_BRIDGE] = FortreeBridgePerStepCallback,
PacifidlogBridgePerStepCallback, [STEP_CB_PACIFIDLOG_BRIDGE] = PacifidlogBridgePerStepCallback,
SootopolisGymIcePerStepCallback, [STEP_CB_SOOTOPOLIS_ICE] = SootopolisGymIcePerStepCallback,
EndTruckSequence, [STEP_CB_TRUCK] = EndTruckSequence,
SecretBasePerStepCallback, [STEP_CB_SECRET_BASE] = SecretBasePerStepCallback,
CrackedFloorPerStepCallback [STEP_CB_CRACKED_FLOOR] = CrackedFloorPerStepCallback
}; };
// they are in pairs but declared as 1D array // they are in pairs but declared as 1D array
src/mossdeep_gym.c
-314
View File
@@ -1,314 +0,0 @@
#include "global.h"
#include "event_object_movement.h"
#include "fieldmap.h"
#include "malloc.h"
#include "mossdeep_gym.h"
#include "script_movement.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_objects.h"
// Movement scripts.
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[];
struct MossdeepSubStruct
{
u8 unk0;
u8 eventTemplateId;
};
struct MossdeepStruct
{
struct MossdeepSubStruct objects[EVENT_OBJECTS_COUNT];
u8 count;
bool8 unk41;
};
// This file's functions.
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;
// code
void InitMossdeepGymTiles(bool8 arg0)
{
if (gUnknown_0203CE50 == NULL)
gUnknown_0203CE50 = AllocZeroed(sizeof(*gUnknown_0203CE50));
gUnknown_0203CE50->unk41 = arg0;
}
void FinishMossdeepGymTiles(void)
{
u8 id;
if (gUnknown_0203CE50 != NULL)
FREE_AND_SET_NULL(gUnknown_0203CE50);
id = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
EventObjectClearHeldMovementIfFinished(&gEventObjects[id]);
ScriptMovement_UnfreezeEventObjects();
}
u16 MossdeepGym_MoveEvents(u8 arg0)
{
u8 i;
struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates;
u16 localId = 0;
for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++)
{
s32 var;
u8 r5;
s16 x = events[i].x + 7;
s16 y = events[i].y + 7;
u16 metatile = MapGridGetMetatileIdAt(x, y);
if (!gUnknown_0203CE50->unk41)
var = 0x250;
else
var = 0x298;
if (metatile < 0x250)
continue;
if ((u8)((metatile - var) / 8) >= 5)
continue;
if ((u8)((metatile - var) / 8) != arg0)
continue;
r5 = (u8)((metatile - var) % 8);
if (r5 < 4)
{
s8 x = 0;
s8 y = 0;
const u8 *movementScript;
switch (r5)
{
case 0:
movementScript = gUnknown_08612698;
x = 1;
break;
case 1:
movementScript = gUnknown_0861269C;
y = 1;
break;
case 2:
movementScript = gUnknown_086126A0;
x = -1;
break;
case 3:
movementScript = gUnknown_086126A4;
y = -1;
break;
default:
continue;
}
events[i].x += x;
events[i].y += y;
if (GetEventObjectIdByLocalIdAndMap(events[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup) != EVENT_OBJECTS_COUNT)
{
AddEventObject(i, r5);
localId = events[i].localId;
ScriptMovement_StartObjectMovementScript(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, movementScript);
}
else
{
sub_81A8D94(i, r5);
}
}
}
return localId;
}
void MossdeepGym_TurnEvents(void)
{
u8 i;
s32 var;
struct EventObjectTemplate *events;
if (gUnknown_0203CE50 == NULL)
return;
if (!gUnknown_0203CE50->unk41)
var = 0x250;
else
var = 0x298;
events = gSaveBlock1Ptr->eventObjectTemplates;
for (i = 0; i < gUnknown_0203CE50->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;
u16 metatile = MapGridGetMetatileIdAt(x, y);
r0 = (u8)((metatile - var) % 8);
r0 -= (gUnknown_0203CE50->objects[i].unk0);
if (r0 < 0 || r0 == 3)
{
if (r0 == -3)
r6 = 1;
else
r6 = 0;
}
else
{
if (r0 > 0)
r6 = 1;
else
r6 = 2;
}
eventObjectId = GetEventObjectIdByLocalIdAndMap(events[gUnknown_0203CE50->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
if (eventObjectId != EVENT_OBJECTS_COUNT)
{
const u8 *movementScript;
u8 direction = gEventObjects[eventObjectId].facingDirection;
if (r6 == 0)
{
switch (direction)
{
case DIR_EAST:
movementScript = gUnknown_086126AE;
events[gUnknown_0203CE50->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;
break;
case DIR_WEST:
movementScript = gUnknown_086126AA;
events[gUnknown_0203CE50->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;
break;
default:
continue;
}
ScriptMovement_StartObjectMovementScript(events[gUnknown_0203CE50->objects[i].eventTemplateId].localId,
gSaveBlock1Ptr->location.mapNum,
gSaveBlock1Ptr->location.mapGroup,
movementScript);
}
else if (r6 == 1)
{
switch (direction)
{
case DIR_EAST:
movementScript = gUnknown_086126AA;
events[gUnknown_0203CE50->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;
break;
case DIR_WEST:
movementScript = gUnknown_086126AE;
events[gUnknown_0203CE50->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;
break;
default:
continue;
}
ScriptMovement_StartObjectMovementScript(events[gUnknown_0203CE50->objects[i].eventTemplateId].localId,
gSaveBlock1Ptr->location.mapNum,
gSaveBlock1Ptr->location.mapGroup,
movementScript);
}
}
}
}
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++;
}
static void sub_81A8D94(u8 eventTemplateId, u8 arg1)
{
s8 r0;
s32 r6;
s32 var;
u16 movementType;
struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates;
s16 x = events[eventTemplateId].x + 7;
s16 y = events[eventTemplateId].y + 7;
u16 metatile = MapGridGetMetatileIdAt(x, y);
if (!gUnknown_0203CE50->unk41)
var = 0x250;
else
var = 0x298;
r0 = (u8)((metatile - var) % 8);
r0 -= arg1;
if (r0 < 0 || r0 == 3)
r6 = 0;
else if (r0 > 0 || r0 == -3)
r6 = 1;
else
r6 = 2;
movementType = events[eventTemplateId].movementType;
if (r6 == 0)
{
switch (movementType)
{
case MOVEMENT_TYPE_FACE_RIGHT:
events[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP;
break;
case MOVEMENT_TYPE_FACE_DOWN:
events[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT;
break;
case MOVEMENT_TYPE_FACE_LEFT:
events[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN;
break;
case MOVEMENT_TYPE_FACE_UP:
events[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT;
break;
default:
break;
}
}
else if (r6 == 1)
{
switch (movementType)
{
case MOVEMENT_TYPE_FACE_RIGHT:
events[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN;
break;
case MOVEMENT_TYPE_FACE_DOWN:
events[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT;
break;
case MOVEMENT_TYPE_FACE_LEFT:
events[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP;
break;
case MOVEMENT_TYPE_FACE_UP:
events[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT;
break;
default:
break;
}
}
}
src/overworld.c
+2 -2
View File
@@ -1183,7 +1183,7 @@ void Overworld_ClearSavedMusic(void)
static void sub_8085810(void) static void sub_8085810(void)
{ {
if (FlagGet(FLAG_SPECIAL_FLAG_0x4001) != TRUE) if (FlagGet(FLAG_DONT_TRANSITION_MUSIC) != TRUE)
{ {
u16 newMusic = GetWarpDestinationMusic(); u16 newMusic = GetWarpDestinationMusic();
u16 currentMusic = GetCurrentMapMusic(); u16 currentMusic = GetCurrentMapMusic();
@@ -1231,7 +1231,7 @@ void TryFadeOutOldMapMusic(void)
{ {
u16 currentMusic = GetCurrentMapMusic(); u16 currentMusic = GetCurrentMapMusic();
u16 warpMusic = GetWarpDestinationMusic(); 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 if (currentMusic == MUS_NAMINORI
&& VarGet(VAR_SKY_PILLAR_STATE) == 2 && VarGet(VAR_SKY_PILLAR_STATE) == 2
src/rotating_tile_puzzle.c
+338
View File
@@ -0,0 +1,338 @@
#include "global.h"
#include "event_object_movement.h"
#include "fieldmap.h"
#include "malloc.h"
#include "rotating_tile_puzzle.h"
#include "script_movement.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_objects.h"
#include "constants/metatile_labels.h"
extern const u8 RotatingTilePuzzle_Movement_ShiftRight[];
extern const u8 RotatingTilePuzzle_Movement_ShiftDown[];
extern const u8 RotatingTilePuzzle_Movement_ShiftLeft[];
extern const u8 RotatingTilePuzzle_Movement_ShiftUp[];
extern const u8 RotatingTilePuzzle_Movement_FaceRight[];
extern const u8 RotatingTilePuzzle_Movement_FaceDown[];
extern const u8 RotatingTilePuzzle_Movement_FaceLeft[];
extern const u8 RotatingTilePuzzle_Movement_FaceUp[];
#define ROTATE_COUNTERCLOCKWISE 0
#define ROTATE_CLOCKWISE 1
#define ROTATE_NONE 2
struct RotatingTileObject
{
u8 prevPuzzleTileNum;
u8 eventTemplateId;
};
struct RotatingTilePuzzle
{
struct RotatingTileObject objects[EVENT_OBJECTS_COUNT];
u8 numObjects;
bool8 isTrickHouse;
};
// This file's functions.
static void SaveRotatingTileObject(u8 eventTemplateId, u8 arg1);
static void TurnUnsavedRotatingTileObject(u8 eventTemplateId, u8 arg1);
// EWRAM vars
EWRAM_DATA static struct RotatingTilePuzzle *sRotatingTilePuzzle = NULL;
// code
void InitRotatingTilePuzzle(bool8 isTrickHouse)
{
if (sRotatingTilePuzzle == NULL)
sRotatingTilePuzzle = AllocZeroed(sizeof(*sRotatingTilePuzzle));
sRotatingTilePuzzle->isTrickHouse = isTrickHouse;
}
void FreeRotatingTilePuzzle(void)
{
u8 id;
if (sRotatingTilePuzzle != NULL)
FREE_AND_SET_NULL(sRotatingTilePuzzle);
id = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
EventObjectClearHeldMovementIfFinished(&gEventObjects[id]);
ScriptMovement_UnfreezeEventObjects();
}
u16 MoveRotatingTileObjects(u8 puzzleNumber)
{
u8 i;
struct EventObjectTemplate *eventObjects = gSaveBlock1Ptr->eventObjectTemplates;
u16 localId = 0;
for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++)
{
s32 puzzleTileStart;
u8 puzzleTileNum;
s16 x = eventObjects[i].x + 7;
s16 y = eventObjects[i].y + 7;
u16 metatile = MapGridGetMetatileIdAt(x, y);
if (!sRotatingTilePuzzle->isTrickHouse)
puzzleTileStart = METATILE_MossdeepGym_YellowArrow_Right;
else
puzzleTileStart = METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right;
// Object is on a metatile before the puzzle tile section
// UB: Because this is not if (metatile < puzzleTileStart), for the trick house (metatile - puzzleTileStart) below can result in casting a negative value to u8
if (metatile < METATILE_MossdeepGym_YellowArrow_Right)
continue;
// Object is on a metatile after the puzzle tile section (never occurs, in both cases the puzzle tiles are last)
if ((u8)((metatile - puzzleTileStart) / 8) >= 5)
continue;
// Object is on a metatile in puzzle tile section, but not one of the currently rotating color
if ((u8)((metatile - puzzleTileStart) / 8) != puzzleNumber)
continue;
puzzleTileNum = (u8)((metatile - puzzleTileStart) % 8);
// First 4 puzzle tiles are the colored arrows
if (puzzleTileNum < 4)
{
s8 x = 0;
s8 y = 0;
const u8 *movementScript;
switch (puzzleTileNum)
{
case 0: // Right Arrow
movementScript = RotatingTilePuzzle_Movement_ShiftRight;
x = 1;
break;
case 1: // Down Arrow
movementScript = RotatingTilePuzzle_Movement_ShiftDown;
y = 1;
break;
case 2: // Left Arrow
movementScript = RotatingTilePuzzle_Movement_ShiftLeft;
x = -1;
break;
case 3: // Up Arrow
movementScript = RotatingTilePuzzle_Movement_ShiftUp;
y = -1;
break;
default:
continue;
}
eventObjects[i].x += x;
eventObjects[i].y += y;
if (GetEventObjectIdByLocalIdAndMap(eventObjects[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup) != EVENT_OBJECTS_COUNT)
{
SaveRotatingTileObject(i, puzzleTileNum);
localId = eventObjects[i].localId;
ScriptMovement_StartObjectMovementScript(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, movementScript);
}
// Never reached in normal gameplay
else
{
TurnUnsavedRotatingTileObject(i, puzzleTileNum);
}
}
}
return localId;
}
void TurnRotatingTileObjects(void)
{
u8 i;
s32 puzzleTileStart;
struct EventObjectTemplate *eventObjects;
if (sRotatingTilePuzzle == NULL)
return;
if (!sRotatingTilePuzzle->isTrickHouse)
puzzleTileStart = METATILE_MossdeepGym_YellowArrow_Right;
else
puzzleTileStart = METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right;
eventObjects = gSaveBlock1Ptr->eventObjectTemplates;
for (i = 0; i < sRotatingTilePuzzle->numObjects; i++)
{
s32 rotation;
s8 tileDifference;
u8 eventObjectId;
s16 x = eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].x + 7;
s16 y = eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].y + 7;
u16 metatile = MapGridGetMetatileIdAt(x, y);
// NOTE: The following 2 assignments and if else could all be replaced with rotation = ROTATE_COUNTERCLOCKWISE
// For an object to be saved in sRotatingTilePuzzle->objects, it must have been on a colored arrow tile
// After the first assignment, tileDifference will always be a number [0-3] representing which arrow tile the object is on now (0: right, 1: down, 2: left, 3: up)
// prevPuzzleTileNum will similarly be a number [0-3] representing the arrow tile the object just moved from
// All the puzzles are oriented counter-clockwise and can only move 1 step at a time, so the difference between the current tile and the previous tile will always either be -1 or 3 (0-1, 1-2, 2-3, 3-0)
// Which means tileDifference will always either be -1 or 3 after the below subtraction, and rotation will always be ROTATE_COUNTERCLOCKWISE after the following conditionals
tileDifference = (u8)((metatile - puzzleTileStart) % 8);
tileDifference -= (sRotatingTilePuzzle->objects[i].prevPuzzleTileNum);
// Always true, see above
if (tileDifference < 0 || tileDifference == 3)
{
// Always false, see above
if (tileDifference == -3)
rotation = ROTATE_CLOCKWISE;
else
rotation = ROTATE_COUNTERCLOCKWISE;
}
else
{
if (tileDifference > 0)
rotation = ROTATE_CLOCKWISE;
else
rotation = ROTATE_NONE;
}
eventObjectId = GetEventObjectIdByLocalIdAndMap(eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
if (eventObjectId != EVENT_OBJECTS_COUNT)
{
const u8 *movementScript;
u8 direction = gEventObjects[eventObjectId].facingDirection;
if (rotation == ROTATE_COUNTERCLOCKWISE)
{
switch (direction)
{
case DIR_EAST:
movementScript = RotatingTilePuzzle_Movement_FaceUp;
eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP;
break;
case DIR_SOUTH:
movementScript = RotatingTilePuzzle_Movement_FaceRight;
eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT;
break;
case DIR_WEST:
movementScript = RotatingTilePuzzle_Movement_FaceDown;
eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN;
break;
case DIR_NORTH:
movementScript = RotatingTilePuzzle_Movement_FaceLeft;
eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT;
break;
default:
continue;
}
ScriptMovement_StartObjectMovementScript(eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].localId,
gSaveBlock1Ptr->location.mapNum,
gSaveBlock1Ptr->location.mapGroup,
movementScript);
}
// Never reached
else if (rotation == ROTATE_CLOCKWISE)
{
switch (direction)
{
case DIR_EAST:
movementScript = RotatingTilePuzzle_Movement_FaceDown;
eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN;
break;
case DIR_SOUTH:
movementScript = RotatingTilePuzzle_Movement_FaceLeft;
eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT;
break;
case DIR_WEST:
movementScript = RotatingTilePuzzle_Movement_FaceUp;
eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP;
break;
case DIR_NORTH:
movementScript = RotatingTilePuzzle_Movement_FaceRight;
eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT;
break;
default:
continue;
}
ScriptMovement_StartObjectMovementScript(eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].localId,
gSaveBlock1Ptr->location.mapNum,
gSaveBlock1Ptr->location.mapGroup,
movementScript);
}
}
}
}
static void SaveRotatingTileObject(u8 eventTemplateId, u8 puzzleTileNum)
{
sRotatingTilePuzzle->objects[sRotatingTilePuzzle->numObjects].eventTemplateId = eventTemplateId;
sRotatingTilePuzzle->objects[sRotatingTilePuzzle->numObjects].prevPuzzleTileNum = puzzleTileNum;
sRotatingTilePuzzle->numObjects++;
}
// Functionally unused
static void TurnUnsavedRotatingTileObject(u8 eventTemplateId, u8 puzzleTileNum)
{
s8 tileDifference;
s32 rotation;
s32 puzzleTileStart;
u16 movementType;
struct EventObjectTemplate *eventObjects = gSaveBlock1Ptr->eventObjectTemplates;
s16 x = eventObjects[eventTemplateId].x + 7;
s16 y = eventObjects[eventTemplateId].y + 7;
u16 metatile = MapGridGetMetatileIdAt(x, y);
if (!sRotatingTilePuzzle->isTrickHouse)
puzzleTileStart = METATILE_MossdeepGym_YellowArrow_Right;
else
puzzleTileStart = METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right;
tileDifference = (u8)((metatile - puzzleTileStart) % 8);
tileDifference -= puzzleTileNum;
if (tileDifference < 0 || tileDifference == 3)
rotation = ROTATE_COUNTERCLOCKWISE;
else if (tileDifference > 0 || tileDifference == -3)
rotation = ROTATE_CLOCKWISE;
else
rotation = ROTATE_NONE;
movementType = eventObjects[eventTemplateId].movementType;
if (rotation == ROTATE_COUNTERCLOCKWISE)
{
switch (movementType)
{
case MOVEMENT_TYPE_FACE_RIGHT:
eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP;
break;
case MOVEMENT_TYPE_FACE_DOWN:
eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT;
break;
case MOVEMENT_TYPE_FACE_LEFT:
eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN;
break;
case MOVEMENT_TYPE_FACE_UP:
eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT;
break;
default:
break;
}
}
else if (rotation == ROTATE_CLOCKWISE)
{
switch (movementType)
{
case MOVEMENT_TYPE_FACE_RIGHT:
eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN;
break;
case MOVEMENT_TYPE_FACE_DOWN:
eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT;
break;
case MOVEMENT_TYPE_FACE_LEFT:
eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP;
break;
case MOVEMENT_TYPE_FACE_UP:
eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT;
break;
default:
break;
}
}
}
src/scrcmd.c
+13 -13
View File
@@ -27,13 +27,13 @@
#include "event_obj_lock.h" #include "event_obj_lock.h"
#include "menu.h" #include "menu.h"
#include "money.h" #include "money.h"
#include "mossdeep_gym.h"
#include "mystery_event_script.h" #include "mystery_event_script.h"
#include "palette.h" #include "palette.h"
#include "party_menu.h" #include "party_menu.h"
#include "pokemon_storage_system.h" #include "pokemon_storage_system.h"
#include "random.h" #include "random.h"
#include "overworld.h" #include "overworld.h"
#include "rotating_tile_puzzle.h"
#include "rtc.h" #include "rtc.h"
#include "script.h" #include "script.h"
#include "script_menu.h" #include "script_menu.h"
@@ -815,7 +815,7 @@ bool8 ScrCmd_warpteleport(struct ScriptContext *ctx)
return TRUE; return TRUE;
} }
bool8 ScrCmd_warpD7(struct ScriptContext *ctx) bool8 ScrCmd_warpmossdeepgym(struct ScriptContext *ctx)
{ {
u8 mapGroup = ScriptReadByte(ctx); u8 mapGroup = ScriptReadByte(ctx);
u8 mapNum = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx);
@@ -824,7 +824,7 @@ bool8 ScrCmd_warpD7(struct ScriptContext *ctx)
u16 y = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx));
SetWarpDestination(mapGroup, mapNum, warpId, x, y); SetWarpDestination(mapGroup, mapNum, warpId, x, y);
sub_80AF87C(); DoMossdeepGymWarp();
ResetInitialPlayerAvatarState(); ResetInitialPlayerAvatarState();
return TRUE; return TRUE;
} }
@@ -2149,31 +2149,31 @@ bool8 ScrCmd_takecoins(struct ScriptContext *ctx)
return FALSE; return FALSE;
} }
bool8 ScrCmd_mossdeepgym1(struct ScriptContext *ctx) bool8 ScrCmd_moverotatingtileobjects(struct ScriptContext *ctx)
{ {
u16 v1 = VarGet(ScriptReadHalfword(ctx)); u16 puzzleNumber = VarGet(ScriptReadHalfword(ctx));
sMovingNpcId = MossdeepGym_MoveEvents(v1); sMovingNpcId = MoveRotatingTileObjects(puzzleNumber);
return FALSE; return FALSE;
} }
bool8 ScrCmd_mossdeepgym2(struct ScriptContext *ctx) bool8 ScrCmd_turnrotatingtileobjects(struct ScriptContext *ctx)
{ {
MossdeepGym_TurnEvents(); TurnRotatingTileObjects();
return FALSE; return FALSE;
} }
bool8 ScrCmd_mossdeepgym3(struct ScriptContext *ctx) bool8 ScrCmd_initrotatingtilepuzzle(struct ScriptContext *ctx)
{ {
u16 v1 = VarGet(ScriptReadHalfword(ctx)); u16 isTrickHouse = VarGet(ScriptReadHalfword(ctx));
InitMossdeepGymTiles(v1); InitRotatingTilePuzzle(isTrickHouse);
return FALSE; return FALSE;
} }
bool8 ScrCmd_mossdeepgym4(struct ScriptContext *ctx) bool8 ScrCmd_freerotatingtilepuzzle(struct ScriptContext *ctx)
{ {
FinishMossdeepGymTiles(); FreeRotatingTilePuzzle();
return FALSE; return FALSE;
} }
sym_ewram.txt
+1 -1
View File
@@ -129,7 +129,7 @@
.include "src/match_call.o" .include "src/match_call.o"
.include "src/menu.o" .include "src/menu.o"
.include "src/battle_factory_screen.o" .include "src/battle_factory_screen.o"
.include "src/mossdeep_gym.o" .include "src/rotating_tile_puzzle.o"
.include "src/item_menu.o" .include "src/item_menu.o"
.include "src/list_menu.o" .include "src/list_menu.o"
.include "src/dynamic_placeholder_text_util.o" .include "src/dynamic_placeholder_text_util.o"