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

Merge branch 'master' into doc-ttower

Browse Source
This commit is contained in:
GriffinR
2020-02-15 20:44:57 -05:00
committed by GitHub
parent 34deceb136 fee980decd
commit a4cd331634
327 changed files with 14966 additions and 18895 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/berry_crush.s
+19 -13
View File
@@ -339,22 +339,28 @@ gUnknown_846F458:: @ 846F458
gUnknown_846F470:: @ 846F470
spr_template 5, 5, gOamData_AffineDouble_ObjNormal_32x32, gUnknown_846F404, NULL, gUnknown_846F408, SpriteCallbackDummy
gUnknown_846F488:: @ 846F488 struct UnkStruct3? perhaps not
.byte 9, 2, 8
gUnknown_846F488:: @ 846F488 DigitObjUtilTemplate
@ strConvMode, shape, size, priority
.byte 1 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 9
.byte 2, 8 @ ndigits, width
.align 2
.2byte 0x9c, 0x00
.4byte gUnknown_846F2F8 + 0x18
.4byte gUnknown_846F320 + 0x10
.byte 8, 2, 8
.2byte 0x9c, 0x00 @ x, y
.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
.4byte gUnknown_846F320 + 0x10 @ spritePalette
@ strConvMode, shape, size, priority
.byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8
.byte 2, 8 @ ndigits, width
.align 2
.2byte 0xb4, 0x00
.4byte gUnknown_846F2F8 + 0x18
.4byte gUnknown_846F320 + 0x10
.byte 8, 2, 8
.2byte 0xb4, 0x00 @ x, y
.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
.4byte gUnknown_846F320 + 0x10 @ spritePalette
@ strConvMode, shape, size, priority
.byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8
.byte 2, 8 @ ndigits, width
.align 2
.2byte 0xcc, 0x00
.4byte gUnknown_846F2F8 + 0x18
.4byte gUnknown_846F320 + 0x10
.2byte 0xcc, 0x00 @ x, y
.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
.4byte gUnknown_846F320 + 0x10 @ spritePalette
gUnknown_846F4B8:: @ 846F4B8
.4byte gUnknown_841D034
data/data_8479668.s
+30 -72
View File
@@ -75,64 +75,64 @@ gUnknown_847AA8F::
gUnknown_847AAA8::
.string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}'{CLEAR 18} $"
gUnknown_847AAC1::
gText_UnionRoomChatKeyboard_ABCDE::
.string "ABCDE$"
gUnknown_847AAC7::
gText_UnionRoomChatKeyboard_FGHIJ::
.string "FGHIJ$"
gUnknown_847AACD::
gText_UnionRoomChatKeyboard_KLMNO::
.string "KLMNO$"
gUnknown_847AAD3::
gText_UnionRoomChatKeyboard_PQRST::
.string "PQRST$"
gUnknown_847AAD9::
gText_UnionRoomChatKeyboard_UVWXY::
.string "UVWXY$"
gUnknown_847AADF::
gText_UnionRoomChatKeyboard_Z::
.string "Z $"
gUnknown_847AAE5::
gText_UnionRoomChatKeyboard_01234Upper::
.string "01234$"
gUnknown_847AAEB::
gText_UnionRoomChatKeyboard_56789Upper::
.string "56789$"
gUnknown_847AAF1::
gText_UnionRoomChatKeyboard_PunctuationUpper::
.string ".,!? $"
gUnknown_847AAF7::
gText_UnionRoomChatKeyboard_SymbolsUpper::
.string "-/&… $"
gUnknown_847AAFD::
gText_UnionRoomChatKeyboard_abcde::
.string "abcde$"
gUnknown_847AB03::
gText_UnionRoomChatKeyboard_fghij::
.string "fghij$"
gUnknown_847AB09::
gText_UnionRoomChatKeyboard_klmno::
.string "klmno$"
gUnknown_847AB0F::
gText_UnionRoomChatKeyboard_pqrst::
.string "pqrst$"
gUnknown_847AB15::
gText_UnionRoomChatKeyboard_uvwxy::
.string "uvwxy$"
gUnknown_847AB1B::
gText_UnionRoomChatKeyboard_z::
.string "z $"
gUnknown_847AB21::
gText_UnionRoomChatKeyboard_01234Lower::
.string "01234$"
gUnknown_847AB27::
gText_UnionRoomChatKeyboard_56789Lower::
.string "56789$"
gUnknown_847AB2D::
gText_UnionRoomChatKeyboard_PunctuationLower::
.string ".,!? $"
gUnknown_847AB33::
gText_UnionRoomChatKeyboard_SymbolsLower::
.string "-/&… $"
.string "$"
@@ -144,82 +144,40 @@ gUnknown_847AB33::
.string "$"
.string "$"
gUnknown_847AB41::
gText_UnionRoomChatKeyboard_Emoji1::
.string "{EXTRA 245}{EXTRA 246}{EXTRA 247}{EXTRA 248}{EXTRA 254}$"
gUnknown_847AB4C::
gText_UnionRoomChatKeyboard_Emoji2::
.string "{EXTRA 249}{EXTRA 250}{EXTRA 252}{EXTRA 251}{EXTRA 253}$"
gUnknown_847AB57::
gText_UnionRoomChatKeyboard_Emoji3::
.string "{EXTRA 236}{EXTRA 237}{EXTRA 238}{EXTRA 235}{EXTRA 234}$"
gUnknown_847AB62::
gText_UnionRoomChatKeyboard_Emoji4::
.string "♂♀{EXTRA 212}{EXTRA 213}{EXTRA 211}$"
gUnknown_847AB6B::
gText_UnionRoomChatKeyboard_Emoji5::
.string "{EXTRA 216}{EXTRA 217}{EXTRA 242}{EXTRA 243}{EXTRA 244}$"
gUnknown_847AB76::
gText_UnionRoomChatKeyboard_Emoji6::
.string "{EXTRA 218}{EXTRA 241}{EXTRA 224}{EXTRA 226}{EXTRA 227}$"
gUnknown_847AB81::
gText_UnionRoomChatKeyboard_Emoji7::
.string "{EXTRA 240}{EXTRA 239}{EXTRA 225}{EXTRA 214}{EXTRA 215}$"
gUnknown_847AB8C::
gText_UnionRoomChatKeyboard_Emoji8::
.string "{EXTRA 228}{EXTRA 229}{EXTRA 230}{EXTRA 231}{EXTRA 232}$"
gUnknown_847AB97::
gText_UnionRoomChatKeyboard_Emoji9::
.string "{EXTRA 233}{EXTRA 220}{EXTRA 221}{EXTRA 222}{EXTRA 209}$"
gUnknown_847ABA2::
gText_UnionRoomChatKeyboard_Emoji10::
.string "{EXTRA 210}{EXTRA 208}ょ: $"
// trainer_tower (again?)
@ 847ABAC
.align 2
.include "data/trainer_tower/trainers.inc"
.align 2
gUnknown_84827AC:: @ 84827AC
.byte 0x08, 0x01
.align 2
.4byte 0
gUnknown_84827B4:: @ 84827B4
.4byte gUnknown_847F16C
.4byte gUnknown_847D26C
.4byte gUnknown_84808AC
.4byte gUnknown_847ABAC
.4byte gUnknown_847CAAC
.4byte gUnknown_847E9AC
.4byte gUnknown_847AF8C
.4byte gUnknown_847CE8C
.4byte gUnknown_847DA2C
.4byte gUnknown_847BF0C
.4byte gUnknown_847D64C
.4byte gUnknown_847DE0C
.4byte gUnknown_847B74C
.4byte gUnknown_847BB2C
.4byte gUnknown_848182C
.4byte gUnknown_847F92C
.4byte gUnknown_847C2EC
.4byte gUnknown_847C6CC
.4byte gUnknown_847E5CC
.4byte gUnknown_84804CC
.4byte gUnknown_84823CC
.4byte gUnknown_8481FEC
.4byte gUnknown_84800EC
.4byte gUnknown_847E1EC
.4byte gUnknown_847ED8C
.4byte gUnknown_848106C
.4byte gUnknown_8480C8C
.4byte gUnknown_847F92C
.4byte gUnknown_847F54C
.4byte gUnknown_847E1EC
.4byte gUnknown_847D64C
.4byte gUnknown_847C6CC
.include "data/text/move_descriptions.inc"
.align 2, 0
data/event_object_80688E4.s
-97
View File
@@ -1,97 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_83A710C::
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
gUnknown_83A714C::
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
gUnknown_83A716C::
.4byte double_little_steps
.4byte triple_little_steps
.4byte triple_little_steps
.4byte double_little_steps
.4byte triple_little_steps
.4byte triple_little_steps
gUnknown_83A7184::
.4byte quad_little_steps
.4byte quad_little_steps
.4byte quad_little_steps
.4byte quad_little_steps
gUnknown_83A7194::
.4byte oct_little_steps
.4byte oct_little_steps
gUnknown_83A719C:: @ 83A719C
.4byte gUnknown_83A710C
.4byte gUnknown_83A714C
.4byte gUnknown_83A716C
.4byte gUnknown_83A7184
.4byte gUnknown_83A7194
gUnknown_83A71B0:: @ 83A71B0
.2byte 0x0010, 0x0008, 0x0006, 0x0004, 0x0002
gUnknown_83A71BA::
.byte 0xfc, 0xfa, 0xf8, 0xf6, 0xf5, 0xf4, 0xf4, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xfa, 0xfc, 0x00, 0x00
gUnknown_83A71CA::
.byte 0x00, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb, 0xfc, 0xfd, 0xfe, 0x00, 0x00, 0x00
gUnknown_83A71DA::
.byte 0xfe, 0xfc, 0xfa, 0xf8, 0xf7, 0xf6, 0xf6, 0xf6, 0xf7, 0xf8, 0xfa, 0xfb, 0xfd, 0xfe, 0x00, 0x00
.align 2
gUnknown_83A71EC:: @ 83A71EC
.4byte gUnknown_83A71BA
.4byte gUnknown_83A71CA
.4byte gUnknown_83A71DA
.align 1
gUnknown_83A71F8:: @ 83A71F8
.2byte 0x10, 0x10, 0x20
gUnknown_83A71FE:: @ 83A71FE
.byte 0, 0, 1
.align 1
gUnknown_83A7202:: @ 83A7202
.2byte 0x20, 0x20, 0x40
gUnknown_83A7208:: @ 83A7208
.byte 1, 1, 2
.align 2
gUnknown_83A720C:: @ 83A720C
abspath "evobjmv.c"
.align 2
gUnknown_83A7240:: @ 83A7240
.asciz "0"
data/event_scripts.s
+17 -49
View File
@@ -31,6 +31,7 @@
#include "constants/trade.h"
#include "constants/quest_log.h"
#include "constants/daycare.h"
#include "constants/easy_chat.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.set FALSE, 0
@@ -638,6 +639,8 @@ gStdScriptsEnd::
.include "data/maps/Route18/text.inc"
.include "data/maps/Route19/text.inc"
.include "data/maps/Route20/text.inc"
.include "data/maps/Route21_North/text.inc"
.include "data/maps/Route21_South/text.inc"
.include "data/maps/Route22/text.inc"
.include "data/maps/Route23/text.inc"
.include "data/maps/Route24/text.inc"
@@ -690,6 +693,7 @@ gStdScriptsEnd::
.include "data/maps/VermilionCity_House1/text.inc"
.include "data/maps/VermilionCity_PokemonCenter_1F/text.inc"
.include "data/maps/VermilionCity_PokemonFanClub/text.inc"
.include "data/maps/VermilionCity_House2/text.inc"
.include "data/maps/VermilionCity_Mart/text.inc"
.include "data/maps/VermilionCity_Gym/text.inc"
.include "data/maps/VermilionCity_House3/text.inc"
@@ -941,23 +945,7 @@ Text_DugUpItemFromGround:: @ 81A5700
.string "from deep in the ground.$"
.include "data/text/route23.inc"
Text_1A58A7:: @ 81A58A7
.string "Let's see…\n"
.string "Uh-oh! You have caught only\l"
.string "{STR_VAR_3} kinds of POKéMON!\p"
.string "You need {STR_VAR_1} kinds\n"
.string "if you want the {STR_VAR_2}.$"
Text_1A5909:: @ 81A5909
.string "…Oh. I see.\p"
.string "When you get {STR_VAR_1} kinds of POKéMON,\n"
.string "come back for the {STR_VAR_2}.$"
Text_1A594D:: @ 81A594D
.string "Oh! I see you don't have any\n"
.string "room for the {STR_VAR_2}.$"
.include "data/text/aide.inc"
.include "data/text/ingame_trade.inc"
Text_CardKeyOpenedDoor:: @ 81A5B88
@@ -1077,13 +1065,7 @@ Text_FoundTMHMContainsMove:: @ 81A63E8
.string "{PLAYER} found a {STR_VAR_2}!\n"
.string "It contains {STR_VAR_1}.$"
Text_1A6407:: @ 81A6407
.string "おつかれさん！\n"
.string "どこに　いきたいんだ？$"
Text_1A641B:: @ 81A641B
.string "All right!\n"
.string "All aboard SEAGALLOP HI-SPEED {STR_VAR_1}!$"
.include "data/text/seagallop.inc"
@ Call for legendary bird trio
Text_Gyaoo:: @ 81A6448
@@ -1189,10 +1171,9 @@ EventScript_ResetEliteFour:: @ 81A6551
.include "data/scripts/obtain_item.inc"
.include "data/scripts/pc.inc"
@ DoEasyChatScreen?
EventScript_1A6AC0:: @ 81A6AC0
Common_ShowEasyChatScreen:: @ 81A6AC0
fadescreen FADE_TO_BLACK
special sub_80FEE44
special ShowEasyChatScreen
fadescreen FADE_FROM_BLACK
return
@@ -1352,8 +1333,8 @@ gUnknown_81A7702:: @ 81A7702
msgbox Text_FillOutQuestionnaire, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1A778A
setvar VAR_0x8004, 14
call EventScript_1A6AC0
setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE
call Common_ShowEasyChatScreen
lock
faceplayer
specialvar VAR_0x8008, Special_GetMartClerkObjectId
@@ -1431,20 +1412,7 @@ EventScript_GetElevatorFloor:: @ 81A7AB9
special Special_GetElevatorFloor
return
EventScript_1A7ABD:: @ 81A7ABD
msgbox Text_1A58A7
release
end
EventScript_1A7AC7:: @ 81A7AC7
msgbox Text_1A594D
release
end
EventScript_1A7AD1:: @ 81A7AD1
msgbox Text_1A5909
release
end
.include "data/scripts/aide.inc"
gUnknown_81A7ADB:: @ 81A7ADB
special sub_80CADC4
@@ -1526,21 +1494,21 @@ Common_EventScript_DirectCornerAttendant:: @ 81A8D02
call CableClub_EventScript_DirectCornerAttendant
end
VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08
VermilionCity_PokemonCenter_1F_EventScript_VSSeekerWoman:: @ 81A8D08
lock
faceplayer
goto_if_set FLAG_GOT_VS_SEEKER, EventScript_1A8D3F
msgbox Text_194234
goto_if_set FLAG_GOT_VS_SEEKER, VermilionCity_PokemonCenter_1F_EventScript_ExplainVSSeeker
msgbox VermilionCity_PokemonCenter_1F_Text_UrgeToBattleSomeoneAgain
setflag FLAG_GOT_VS_SEEKER
giveitem ITEM_VS_SEEKER
compare VAR_RESULT, FALSE
goto_if_eq EventScript_BagIsFull
msgbox Text_19430F
msgbox VermilionCity_PokemonCenter_1F_Text_UseDeviceForRematches
release
end
EventScript_1A8D3F:: @ 81A8D3F
msgbox Text_194381
VermilionCity_PokemonCenter_1F_EventScript_ExplainVSSeeker:: @ 81A8D3F
msgbox VermilionCity_PokemonCenter_1F_Text_ExplainVSSeeker
release
end
data/field_screen_effect.s
-15
View File
@@ -1,15 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_83C68E0:: @ 83C68E0
.4byte 4
gUnknown_83C68E4:: @ 83C68E4
.byte 0, 0, 5, 30, 11, 15
.2byte 0x001
gUnknown_83C68EC:: @ 83C68EC
.byte 0, 1, 2
data/graphics.s
+7 -7
View File
@@ -16374,16 +16374,16 @@ gFameCheckerBg3Tilemap:: @ 8EA0700
gFameCheckerBg2Tilemap:: @ 8EA0F00
.incbin "data/graphics/fame_checker_tilemap2.bin"
gUnknown_8EA1700:: @ 8EA1700
gLinkMiscMenu_Pal:: @ 8EA1700
.incbin "graphics/interface/union_room_chat.gbapal"
gUnknown_8EA1720:: @ 8EA1720
gLinkMiscMenu_Gfx:: @ 8EA1720
.incbin "graphics/interface/union_room_chat.4bpp.lz"
gUnknown_8EA1958:: @ 8EA1958
gLinkMiscMenu_Tilemap:: @ 8EA1958
.incbin "graphics/interface/union_room_chat.bin.lz"
gUnknown_8EA1A50:: @ 8EA1A50
gUnionRoomChatIcons:: @ 8EA1A50
.incbin "graphics/interface/union_room_chat_icons.4bpp.lz"
.align 2
@@ -16508,13 +16508,13 @@ gTilesetPalettes_8EA9D88:: @ 8EA9D88
gTilesetTiles_8EA9F88:: @ 8EA9F88
.incbin "data/tilesets/secondary/82D4E6C/tiles.4bpp.lz"
gUnknown_8EAA9F0:: @ 8EAA9F0
gUnionRoomChatPanelBgPal_7:: @ 8EAA9F0
.incbin "graphics/interface/union_room_chat_panel.gbapal"
gUnknown_8EAAA10:: @ 8EAAA10
gUnionRoomChatPanelBgTiles:: @ 8EAAA10
.incbin "graphics/interface/union_room_chat_panel.4bpp.lz"
gUnknown_8EAAA6C:: @ 8EAAA6C
gUnionRoomChatPanelBgMap:: @ 8EAAA6C
.incbin "graphics/interface/union_room_chat_panel.bin.lz"
gCreditsMonBackdropPals:: @ 8EAAB18
data/maps/CinnabarIsland/scripts.inc
+1 -1
View File
@@ -213,7 +213,7 @@ CinnabarIsland_EventScript_SailToOneIsland:: @ 81670E6
setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1
setvar VAR_0x8004, SEAGALLOP_CINNABAR_ISLAND
setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND
goto EventScript_1A90DA
goto EventScript_SetSail
end
CinnabarIsland_EventScript_ApproachShore:: @ 8167142
data/maps/FiveIsland_Harbor/scripts.inc
+1 -1
View File
@@ -7,5 +7,5 @@ FiveIsland_Harbor_EventScript_171D43:: @ 8171D43
message Text_WhereDoYouWantToSail
waitmessage
setvar VAR_0x8004, SEAGALLOP_FIVE_ISLAND
goto EventScript_1A900F
goto EventScript_ChooseDestFromIsland
end
data/maps/FourIsland_Harbor/scripts.inc
+1 -1
View File
@@ -7,5 +7,5 @@ FourIsland_Harbor_EventScript_171C99:: @ 8171C99
message Text_WhereDoYouWantToSail
waitmessage
setvar VAR_0x8004, SEAGALLOP_FOUR_ISLAND
goto EventScript_1A900F
goto EventScript_ChooseDestFromIsland
end
data/maps/LavenderTown_Mart/text.inc
+5
View File
@@ -18,3 +18,8 @@ LavenderTown_Mart_Text_TrainerDuosCanChallengeYou:: @ 8193DF1
.string "If that happens, you have to send\n"
.string "out two POKéMON to battle, too.$"
LavenderTown_Mart_Text_SoldNuggetFromMountainsFor5000:: @ 8193E82
.string "この　あいだ　やまおくで\n"
.string "きんのたまを　ひろい　ましてね！\p"
.string "つかえない　しなもの　ですが\n"
.string "うったら　なんと　5000¥でした$"
data/maps/OneIsland_Harbor/scripts.inc
+1 -1
View File
@@ -38,5 +38,5 @@ OneIsland_Harbor_EventScript_1713BD:: @ 81713BD
message Text_WhereDoYouWantToSail
waitmessage
setvar VAR_0x8004, SEAGALLOP_ONE_ISLAND
goto EventScript_1A8EC5
goto EventScript_ChooseDestFromOneIsland
end
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -503,7 +503,7 @@ EventScript_1711DA:: @ 81711DA
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 3
setvar VAR_0x8004, SEAGALLOP_ONE_ISLAND
setvar VAR_0x8006, SEAGALLOP_CINNABAR_ISLAND
goto EventScript_1A90DA
goto EventScript_SetSail
end
EventScript_1712E4:: @ 81712E4
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+3 -3
View File
@@ -346,7 +346,7 @@ EventScript_16939C:: @ 816939C
end
EventScript_1693AC:: @ 81693AC
trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A
trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory
goto EventScript_1694C2
end
@@ -402,7 +402,7 @@ EventScript_169414:: @ 8169414
end
EventScript_169424:: @ 8169424
trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A
trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_CHARMANDER, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory
goto EventScript_1694C2
end
@@ -461,7 +461,7 @@ EventScript_16948F:: @ 816948F
end
EventScript_16949F:: @ 816949F
trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A
trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_BULBASAUR, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory
goto EventScript_1694C2
end
data/maps/PalletTown_ProfessorOaksLab/text.inc
+2 -1
View File
@@ -36,7 +36,8 @@ Text_18DDEA:: @ 818DDEA
.string "Unbelievable!\l"
.string "I picked the wrong POKéMON!$"
Text_18DE1A:: @ 818DE1A
@ Also used for early Route 22 battle
Text_RivalVictory:: @ 818DE1A
.string "{RIVAL}: Yeah!\n"
.string "Am I great or what?$"
data/maps/Route1/map.json
+3 -3
View File
@@ -34,7 +34,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route1_EventScript_167EFE",
"script": "Route1_EventScript_MartClerk",
"flag": "0"
},
{
@@ -47,7 +47,7 @@
"movement_range_y": 3,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route1_EventScript_167F52",
"script": "Route1_EventScript_Boy",
"flag": "0"
}
],
@@ -59,7 +59,7 @@
"x": 9,
"y": 31,
"elevation": 0,
"script": "Route1_EventScript_167F5B"
"script": "Route1_EventScript_RouteSign"
}
]
}
data/maps/Route1/scripts.inc
+10 -10
View File
@@ -1,11 +1,11 @@
Route1_MapScripts:: @ 8167EFD
.byte 0
Route1_EventScript_167EFE:: @ 8167EFE
Route1_EventScript_MartClerk:: @ 8167EFE
lock
faceplayer
goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, EventScript_167F48
msgbox gUnknown_818329D
goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, Route1_EventScript_AlreadyGotPotion
msgbox Route1_Text_WorkAtPokeMartTakeSample
textcolor 3
checkitemspace ITEM_POTION, 1
compare VAR_RESULT, FALSE
@@ -16,21 +16,21 @@ Route1_EventScript_167EFE:: @ 8167EFE
waitmessage
waitfanfare
additem ITEM_POTION
msgbox gUnknown_8183387
msgbox Route1_Text_PutPotionAway
call EventScript_1A6675
setflag FLAG_GOT_POTION_ON_ROUTE_1
release
end
EventScript_167F48:: @ 8167F48
msgbox gUnknown_8183347
Route1_EventScript_AlreadyGotPotion:: @ 8167F48
msgbox Route1_Text_ComeSeeUsIfYouNeedPokeBalls
release
end
Route1_EventScript_167F52:: @ 8167F52
msgbox gUnknown_81833B9, MSGBOX_NPC
Route1_EventScript_Boy:: @ 8167F52
msgbox Route1_Text_CanJumpFromLedges, MSGBOX_NPC
end
Route1_EventScript_167F5B:: @ 8167F5B
msgbox gUnknown_818343A, MSGBOX_SIGN
Route1_EventScript_RouteSign:: @ 8167F5B
msgbox Route1_Text_RouteSign, MSGBOX_SIGN
end
data/maps/Route1/text.inc
+5 -5
View File
@@ -1,4 +1,4 @@
gUnknown_818329D:: @ 818329D
Route1_Text_WorkAtPokeMartTakeSample:: @ 818329D
.string "Hi!\n"
.string "I work at a POKéMON MART.\p"
.string "It's part of a convenient chain\n"
@@ -7,22 +7,22 @@ gUnknown_818329D:: @ 818329D
.string "I know, I'll give you a sample.\n"
.string "Here you go!$"
gUnknown_8183347:: @ 8183347
Route1_Text_ComeSeeUsIfYouNeedPokeBalls:: @ 8183347
.string "Please come see us if you need\n"
.string "POKé BALLS for catching POKéMON.$"
gUnknown_8183387:: @ 8183387
Route1_Text_PutPotionAway:: @ 8183387
.string "{PLAYER} put the POTION away in\n"
.string "the BAG's ITEMS POCKET.$"
gUnknown_81833B9:: @ 81833B9
Route1_Text_CanJumpFromLedges:: @ 81833B9
.string "See those ledges along the road?\p"
.string "It's a bit scary, but you can jump\n"
.string "from them.\p"
.string "You can get back to PALLET TOWN\n"
.string "quicker that way.$"
gUnknown_818343A:: @ 818343A
Route1_Text_RouteSign:: @ 818343A
.string "ROUTE 1\n"
.string "PALLET TOWN - VIRIDIAN CITY$"
data/maps/Route10_PokemonCenter_1F/scripts.inc
+3 -3
View File
@@ -34,17 +34,17 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65
goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, EventScript_16FCE7
msgbox gUnknown_819E5FB, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1A7AD1
goto_if_eq Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
getnumberstring 2, VAR_0x8006
call EventScript_16FCF1
compare VAR_0x8006, 20
goto_if_lt EventScript_1A7ABD
goto_if_lt Aide_EventScript_HaventCaughtEnough
msgbox gUnknown_819E733
checkitemspace ITEM_EVERSTONE, 1
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1A7AC7
goto_if_eq Aide_EventScript_NoRoomForItem
giveitem_msg gUnknown_819E786, ITEM_EVERSTONE
setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE
msgbox gUnknown_819E7AF
data/maps/Route11_EastEntrance_2F/scripts.inc
+3 -3
View File
@@ -61,17 +61,17 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8
goto_if_set FLAG_GOT_ITEMFINDER, EventScript_16FE5A
msgbox gUnknown_819E9E5, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1A7AD1
goto_if_eq Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
getnumberstring 2, VAR_0x8006
call EventScript_16FE64
compare VAR_0x8006, 30
goto_if_lt EventScript_1A7ABD
goto_if_lt Aide_EventScript_HaventCaughtEnough
msgbox gUnknown_819EAE4
checkitemspace ITEM_ITEMFINDER, 1
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1A7AC7
goto_if_eq Aide_EventScript_NoRoomForItem
giveitem_msg gUnknown_819EB37, ITEM_ITEMFINDER
setflag FLAG_GOT_ITEMFINDER
msgbox gUnknown_819EB59
data/maps/Route15_WestEntrance_2F/scripts.inc
+3 -3
View File
@@ -24,17 +24,17 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9
goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, EventScript_17013B
msgbox gUnknown_819F5AB, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1A7AD1
goto_if_eq Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
getnumberstring 2, VAR_0x8006
call EventScript_170145
compare VAR_0x8006, 50
goto_if_lt EventScript_1A7ABD
goto_if_lt Aide_EventScript_HaventCaughtEnough
msgbox gUnknown_819F6AA
checkitemspace ITEM_EXP_SHARE, 1
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1A7AC7
goto_if_eq Aide_EventScript_NoRoomForItem
giveitem_msg gUnknown_819F6FD, ITEM_EXP_SHARE
setflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE
msgbox gUnknown_819F71F
data/maps/Route16_NorthEntrance_2F/scripts.inc
+3 -3
View File
@@ -24,17 +24,17 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3
goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, EventScript_170365
msgbox gUnknown_819FB0E, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1A7AD1
goto_if_eq Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
getnumberstring 2, VAR_0x8006
call EventScript_17036F
compare VAR_0x8006, 40
goto_if_lt EventScript_1A7ABD
goto_if_lt Aide_EventScript_HaventCaughtEnough
msgbox gUnknown_819FC15
checkitemspace ITEM_AMULET_COIN, 1
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1A7AC7
goto_if_eq Aide_EventScript_NoRoomForItem
giveitem_msg gUnknown_819FC68, ITEM_AMULET_COIN
setflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE
msgbox gUnknown_819FC93
data/maps/Route2/map.json
+2 -2
View File
@@ -195,14 +195,14 @@
"x": 14,
"y": 12,
"elevation": 0,
"script": "Route2_EventScript_167F6E"
"script": "Route2_EventScript_DiglettsCaveSign"
},
{
"type": "bg_event_type_0",
"x": 7,
"y": 73,
"elevation": 0,
"script": "Route2_EventScript_167F65"
"script": "Route2_EventScript_RouteSign"
}
]
}
data/maps/Route2/scripts.inc
+4 -4
View File
@@ -1,10 +1,10 @@
Route2_MapScripts:: @ 8167F64
.byte 0
Route2_EventScript_167F65:: @ 8167F65
msgbox gUnknown_818345E, MSGBOX_SIGN
Route2_EventScript_RouteSign:: @ 8167F65
msgbox Route2_Text_RouteSign, MSGBOX_SIGN
end
Route2_EventScript_167F6E:: @ 8167F6E
msgbox gUnknown_8183482, MSGBOX_SIGN
Route2_EventScript_DiglettsCaveSign:: @ 8167F6E
msgbox Route2_Text_DiglettsCave, MSGBOX_SIGN
end
data/maps/Route2/text.inc
+2 -2
View File
@@ -1,7 +1,7 @@
gUnknown_818345E:: @ 818345E
Route2_Text_RouteSign:: @ 818345E
.string "ROUTE 2\n"
.string "VIRIDIAN CITY - PEWTER CITY$"
gUnknown_8183482:: @ 8183482
Route2_Text_DiglettsCave:: @ 8183482
.string "DIGLETT'S CAVE$"
data/maps/Route21_North/text.inc
+48
View File
@@ -0,0 +1,48 @@
Text_1882E1:: @ 81882E1
.string "Strong TRAINERS and WATER POKéMON\n"
.string "are common sights in these parts.\p"
.string "They say that MISTY of the\n"
.string "CERULEAN GYM trains here.$"
Text_18835A:: @ 818835A
.string "You want to know if the fish are\n"
.string "biting?$"
Text_188383:: @ 8188383
.string "Dang!$"
Text_188389:: @ 8188389
.string "I can't catch anything good.\n"
.string "Not one good POKéMON to be had!$"
Text_1883C6:: @ 81883C6
.string "I got a big haul!\n"
.string "Wanna go for it?$"
Text_1883E9:: @ 81883E9
.string "Heheh, MAGIKARP just don't make\n"
.string "the grade, do they?$"
Text_18841D:: @ 818841D
.string "I seem to only catch MAGIKARP!$"
Text_18843C:: @ 818843C
.string "The sea cleanses my body and soul!$"
Text_18845F:: @ 818845F
.string "Ayah!$"
Text_188465:: @ 8188465
.string "The sea is great and all, but I\n"
.string "like the mountains, too.$"
Text_18849E:: @ 818849E
.string "おれだって　たまには\n"
.string "およぎに　くるぜ！$"
Text_1884B3:: @ 81884B3
.string "ぐわわ！$"
Text_1884B8:: @ 81884B8
.string "うきやすそう　だと？\n"
.string "うるせー　おおきな　おせわだッ！$"
data/maps/Route21_South/text.inc
+87
View File
@@ -0,0 +1,87 @@
Text_1884D4:: @ 81884D4
.string "I caught my POKéMON at sea.$"
Text_1884F0:: @ 81884F0
.string "Diver!!\n"
.string "Down!!$"
Text_1884FF:: @ 81884FF
.string "Where'd you catch your POKéMON?$"
Text_18851F:: @ 818851F
.string "Right now, I'm in a triathlon meet.$"
Text_188543:: @ 8188543
.string "Pant…\n"
.string "Pant… Pant…$"
Text_188555:: @ 8188555
.string "I'm beat! But, I still have the\n"
.string "bike race and marathon left!$"
Text_188592:: @ 8188592
.string "Ahh!\n"
.string "Feel the sun and the wind!$"
Text_1885B2:: @ 81885B2
.string "Yow!\n"
.string "I lost!$"
Text_1885BF:: @ 81885BF
.string "I'm sunburnt to a crisp!$"
Text_1885D8:: @ 81885D8
.string "Hey, don't scare away the fish!$"
Text_1885F8:: @ 81885F8
.string "Sorry! I'm just so frustrated from\n"
.string "not catching anything.$"
Text_188632:: @ 8188632
.string "Sheesh, I haven't caught a thing.\n"
.string "Could this place actually be a\l"
.string "giant pool or something?$"
Text_18868C:: @ 818868C
.string "Keep me company till I get a hit.$"
Text_1886AE:: @ 81886AE
.string "That burned some time.$"
Text_1886C5:: @ 81886C5
.string "Oh wait!\n"
.string "I got a bite! Yeah!$"
Text_1886E2:: @ 81886E2
.string "LIL: Huh? A battle?\n"
.string "IAN, can't you do it alone?$"
Text_188712:: @ 8188712
.string "LIL: Oh, see?\n"
.string "We lost. Happy now?$"
Text_188734:: @ 8188734
.string "LIL: I'm tired.\n"
.string "Can't we go home already?$"
Text_18875E:: @ 818875E
.string "LIL: Huh? A battle?\n"
.string "I can't be bothered to do it alone.\l"
.string "Bring two POKéMON, won't you?$"
Text_1887B4:: @ 81887B4
.string "IAN: My sis doesn't get enough\n"
.string "exercise, so I made her come.$"
Text_1887F1:: @ 81887F1
.string "IAN: Awww, Sis!\n"
.string "Get it together!$"
Text_188812:: @ 8188812
.string "IAN: Come on, Sis!\p"
.string "You're not going to lose weight\n"
.string "like this!$"
Text_188850:: @ 8188850
.string "IAN: We want a two-on-two battle.\n"
.string "So can you bring two POKéMON?$"
data/maps/Route22/map.json
+7 -7
View File
@@ -62,7 +62,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE22",
"var_value": 1,
"script": "Route22_EventScript_16828C"
"script": "Route22_EventScript_EarlyRivalTriggerTop"
},
{
"type": "trigger",
@@ -71,7 +71,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE22",
"var_value": 1,
"script": "Route22_EventScript_168298"
"script": "Route22_EventScript_EarlyRivalTriggerMid"
},
{
"type": "trigger",
@@ -80,7 +80,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE22",
"var_value": 1,
"script": "Route22_EventScript_1682AB"
"script": "Route22_EventScript_EarlyRivalTriggerBottom"
},
{
"type": "trigger",
@@ -89,7 +89,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE22",
"var_value": 3,
"script": "Route22_EventScript_1683ED"
"script": "Route22_EventScript_LateRivalTriggerTop"
},
{
"type": "trigger",
@@ -98,7 +98,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE22",
"var_value": 3,
"script": "Route22_EventScript_1683F9"
"script": "Route22_EventScript_LateRivalTriggerMid"
},
{
"type": "trigger",
@@ -107,7 +107,7 @@
"elevation": 0,
"var": "VAR_MAP_SCENE_ROUTE22",
"var_value": 3,
"script": "Route22_EventScript_16840C"
"script": "Route22_EventScript_LateRivalTriggerBottom"
}
],
"bg_events": [
@@ -116,7 +116,7 @@
"x": 7,
"y": 12,
"elevation": 0,
"script": "Route22_EventScript_1684E2"
"script": "Route22_EventScript_LeagueGateSign"
}
]
}
data/maps/Route22/scripts.inc
+69 -81
View File
@@ -1,100 +1,94 @@
Route22_MapScripts:: @ 816828B
.byte 0
Route22_EventScript_16828C:: @ 816828C
Route22_EventScript_EarlyRivalTriggerTop:: @ 816828C
lockall
setvar VAR_TEMP_1, 0
goto EventScript_1682BE
EventScript_168297:: @ 8168297
goto Route22_EventScript_EarlyRival
end
Route22_EventScript_168298:: @ 8168298
Route22_EventScript_EarlyRivalTriggerMid:: @ 8168298
lockall
setvar VAR_TEMP_1, 1
setobjectxyperm 1, 25, 5
goto EventScript_1682BE
EventScript_1682AA:: @ 81682AA
goto Route22_EventScript_EarlyRival
end
Route22_EventScript_1682AB:: @ 81682AB
Route22_EventScript_EarlyRivalTriggerBottom:: @ 81682AB
lockall
setvar VAR_TEMP_1, 2
setobjectxyperm 1, 25, 5
goto EventScript_1682BE
EventScript_1682BD:: @ 81682BD
goto Route22_EventScript_EarlyRival
end
EventScript_1682BE:: @ 81682BE
Route22_EventScript_EarlyRival:: @ 81682BE
textcolor 0
playbgm MUS_RIVAL1, 0
addobject 1
compare VAR_TEMP_1, 0
call_if_eq EventScript_168350
call_if_eq Route22_EventScript_EarlyRivalApproach
compare VAR_TEMP_1, 1
call_if_eq EventScript_168350
call_if_eq Route22_EventScript_EarlyRivalApproach
compare VAR_TEMP_1, 2
call_if_eq EventScript_16835B
call_if_eq Route22_EventScript_EarlyRivalApproachBottom
delay 6
msgbox gUnknown_8188890
msgbox Route22_Text_EarlyRivalIntro
compare VAR_STARTER_MON, 2
call_if_eq EventScript_16836D
call_if_eq Route22_EventScript_EarlyRivalSquirtle
compare VAR_STARTER_MON, 1
call_if_eq EventScript_16837C
call_if_eq Route22_EventScript_EarlyRivalBulbasaur
compare VAR_STARTER_MON, 0
call_if_eq EventScript_16838B
msgbox gUnknown_8188974
call_if_eq Route22_EventScript_EarlyRivalCharmander
msgbox Route22_Text_EarlyRivalPostBattle
closemessage
delay 10
playbgm MUS_RIVAL2, 0
compare VAR_TEMP_1, 0
call_if_eq EventScript_16839A
call_if_eq Route22_EventScript_EarlyRivalExit
compare VAR_TEMP_1, 1
call_if_eq EventScript_16839A
call_if_eq Route22_EventScript_EarlyRivalExit
compare VAR_TEMP_1, 2
call_if_eq EventScript_1683A5
call_if_eq Route22_EventScript_EarlyRivalExitBottom
fadedefaultbgm
removeobject 1
setvar VAR_MAP_SCENE_ROUTE22, 2
releaseall
end
EventScript_168350:: @ 8168350
applymovement 1, Movement_1683D1
Route22_EventScript_EarlyRivalApproach:: @ 8168350
applymovement 1, Route22_Movement_RivalApproach
waitmovement 0
return
EventScript_16835B:: @ 816835B
applymovement 1, Movement_1683D9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3
Route22_EventScript_EarlyRivalApproachBottom:: @ 816835B
applymovement 1, Route22_Movement_RivalApproachBottom
applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival
waitmovement 0
return
EventScript_16836D:: @ 816836D
trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A
Route22_EventScript_EarlyRivalSquirtle:: @ 816836D
trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory
return
EventScript_16837C:: @ 816837C
trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A
Route22_EventScript_EarlyRivalBulbasaur:: @ 816837C
trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory
return
EventScript_16838B:: @ 816838B
trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A
Route22_EventScript_EarlyRivalCharmander:: @ 816838B
trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory
return
EventScript_16839A:: @ 816839A
applymovement 1, Movement_1683B8
Route22_EventScript_EarlyRivalExit:: @ 816839A
applymovement 1, Route22_Movement_EarlyRivalExit
waitmovement 0
return
EventScript_1683A5:: @ 81683A5
applymovement 1, Movement_1683C5
Route22_EventScript_EarlyRivalExitBottom:: @ 81683A5
applymovement 1, Route22_Movement_EarlyRivalExitBottom
waitmovement 0
return
Movement_1683B0:: @ 8
Route22_Movement_UnusedRivalExit:: @ 8
walk_right
walk_right
walk_right
@@ -104,7 +98,7 @@ Movement_1683B0:: @ 8
walk_right
step_end
Movement_1683B8:: @ 81683B8
Route22_Movement_EarlyRivalExit:: @ 81683B8
walk_down
walk_right
walk_right
@@ -119,7 +113,7 @@ Movement_1683B8:: @ 81683B8
walk_down
step_end
Movement_1683C5:: @ 81683C5
Route22_Movement_EarlyRivalExitBottom:: @ 81683C5
walk_right
walk_right
walk_right
@@ -133,7 +127,7 @@ Movement_1683C5:: @ 81683C5
walk_down
step_end
Movement_1683D1:: @ 81683D1
Route22_Movement_RivalApproach:: @ 81683D1
walk_right
walk_right
walk_right
@@ -143,7 +137,7 @@ Movement_1683D1:: @ 81683D1
walk_right
step_end
Movement_1683D9:: @ 81683D9
Route22_Movement_RivalApproachBottom:: @ 81683D9
walk_right
walk_right
walk_right
@@ -155,7 +149,7 @@ Movement_1683D9:: @ 81683D9
walk_in_place_fastest_down
step_end
Movement_1683E3:: @ 81683E3
Route22_Movement_PlayerFaceRival:: @ 81683E3
delay_16
delay_16
delay_16
@@ -167,55 +161,49 @@ Movement_1683E3:: @ 81683E3
walk_in_place_fastest_up
step_end
Route22_EventScript_1683ED:: @ 81683ED
Route22_EventScript_LateRivalTriggerTop:: @ 81683ED
lockall
setvar VAR_TEMP_1, 0
goto EventScript_16841F
EventScript_1683F8:: @ 81683F8
goto Route22_EventScript_LateRival
end
Route22_EventScript_1683F9:: @ 81683F9
Route22_EventScript_LateRivalTriggerMid:: @ 81683F9
lockall
setvar VAR_TEMP_1, 1
setobjectxyperm 1, 25, 5
goto EventScript_16841F
EventScript_16840B:: @ 816840B
goto Route22_EventScript_LateRival
end
Route22_EventScript_16840C:: @ 816840C
Route22_EventScript_LateRivalTriggerBottom:: @ 816840C
lockall
setvar VAR_TEMP_1, 2
setobjectxyperm 1, 25, 5
goto EventScript_16841F
EventScript_16841E:: @ 816841E
goto Route22_EventScript_LateRival
end
EventScript_16841F:: @ 816841F
Route22_EventScript_LateRival:: @ 816841F
textcolor 0
playbgm MUS_RIVAL1, 0
addobject 1
compare VAR_TEMP_1, 0
call_if_eq EventScript_16849C
call_if_eq Route22_EventScript_LateRivalApproach
compare VAR_TEMP_1, 1
call_if_eq EventScript_16849C
call_if_eq Route22_EventScript_LateRivalApproach
compare VAR_TEMP_1, 2
call_if_eq EventScript_1684A7
msgbox gUnknown_8188A3C
call_if_eq Route22_EventScript_LateRivalApproachBottom
msgbox Route22_Text_LateRivalIntro
setvar VAR_LAST_TALKED, 1
compare VAR_STARTER_MON, 2
call_if_eq EventScript_1684B9
call_if_eq Route22_EventScript_LateRivalSquirtle
compare VAR_STARTER_MON, 1
call_if_eq EventScript_1684C4
call_if_eq Route22_EventScript_LateRivalBulbasaur
compare VAR_STARTER_MON, 0
call_if_eq EventScript_1684CF
msgbox gUnknown_8188B29
call_if_eq Route22_EventScript_LateRivalCharmander
msgbox Route22_Text_LateRivalPostBattle
closemessage
delay 10
playbgm MUS_RIVAL2, 0
applymovement 1, Movement_1684DA
applymovement 1, Route22_Movement_LateRivalExit
waitmovement 0
fadedefaultbgm
removeobject 1
@@ -223,30 +211,30 @@ EventScript_16841F:: @ 816841F
releaseall
end
EventScript_16849C:: @ 816849C
applymovement 1, Movement_1683D1
Route22_EventScript_LateRivalApproach:: @ 816849C
applymovement 1, Route22_Movement_RivalApproach
waitmovement 0
return
EventScript_1684A7:: @ 81684A7
applymovement 1, Movement_1683D9
applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3
Route22_EventScript_LateRivalApproachBottom:: @ 81684A7
applymovement 1, Route22_Movement_RivalApproachBottom
applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival
waitmovement 0
return
EventScript_1684B9:: @ 81684B9
trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Text_188B08
Route22_EventScript_LateRivalSquirtle:: @ 81684B9
trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Route22_Text_LateRivalDefeat
return
EventScript_1684C4:: @ 81684C4
trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Text_188B08
Route22_EventScript_LateRivalBulbasaur:: @ 81684C4
trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Route22_Text_LateRivalDefeat
return
EventScript_1684CF:: @ 81684CF
trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Text_188B08
Route22_EventScript_LateRivalCharmander:: @ 81684CF
trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Route22_Text_LateRivalDefeat
return
Movement_1684DA:: @ 81684DA
Route22_Movement_LateRivalExit:: @ 81684DA
walk_left
walk_left
walk_left
@@ -256,6 +244,6 @@ Movement_1684DA:: @ 81684DA
walk_left
step_end
Route22_EventScript_1684E2:: @ 81684E2
msgbox gUnknown_8188BFF, MSGBOX_SIGN
Route22_EventScript_LeagueGateSign:: @ 81684E2
msgbox Route22_Text_LeagueGateSign, MSGBOX_SIGN
end
data/maps/Route22/text.inc
+57 -192
View File
@@ -1,201 +1,66 @@
Text_1882E1:: @ 81882E1
.string "Strong TRAINERS and WATER POKéMON\n"
.string "are common sights in these parts.\p"
.string "They say that MISTY of the\n"
.string "CERULEAN GYM trains here.$"
Route22_Text_EarlyRivalIntro:: @ 8188890
.string "{RIVAL}: Hey! {PLAYER}!\p"
.string "You're off to the POKéMON LEAGUE?\n"
.string "Forget about it!\p"
.string "You probably don't have any\n"
.string "BADGES, do you?\p"
.string "The guard won't let you through\n"
.string "without them.\p"
.string "By the way, did your POKéMON get\n"
.string "any stronger?$"
Text_18835A:: @ 818835A
.string "You want to know if the fish are\n"
.string "biting?$"
Route22_Text_EarlyRivalDefeat:: @ 8188959
.string "Awww!\n"
.string "You just lucked out!$"
Text_188383:: @ 8188383
.string "Dang!$"
Route22_Text_EarlyRivalPostBattle:: @ 8188974
.string "I heard the POKéMON LEAGUE is\n"
.string "crawling with tough TRAINERS.\p"
.string "I have to figure out how to get\n"
.string "past them.\p"
.string "You should quit dawdling and get a\n"
.string "move on!$"
Text_188389:: @ 8188389
.string "I can't catch anything good.\n"
.string "Not one good POKéMON to be had!$"
@ Translated in RB as "{RIVAL}: What? Why do I have 2 POKéMON? You should catch some more too!"
Route22_Text_RivalShouldCatchSomeMons:: @ 8188A07
.string "{RIVAL}“なんだ？\n"
.string "ポケモン　2ひきも\l"
.string "もってるの　なぜか　だって？\p"
.string "おまえも\n"
.string "つかまえれば　いい　じゃん！$"
Text_1883C6:: @ 81883C6
.string "I got a big haul!\n"
.string "Wanna go for it?$"
Route22_Text_LateRivalIntro:: @ 8188A3C
.string "{RIVAL}: What? {PLAYER}!\n"
.string "What a surprise to see you here!\p"
.string "So you're going to the POKéMON\n"
.string "LEAGUE?\p"
.string "You collected all the BADGES, too?\n"
.string "That's cool!\p"
.string "Then I'll whip you, {PLAYER}, as a\n"
.string "warm-up for the POKéMON LEAGUE!\p"
.string "Come on!$"
Text_1883E9:: @ 81883E9
.string "Heheh, MAGIKARP just don't make\n"
.string "the grade, do they?$"
Route22_Text_LateRivalDefeat:: @ 8188B08
.string "What!?\p"
.string "I was just careless, you!$"
Text_18841D:: @ 818841D
.string "I seem to only catch MAGIKARP!$"
Route22_Text_LateRivalPostBattle:: @ 8188B29
.string "That loosened me up.\n"
.string "I'm ready for the POKéMON LEAGUE!\p"
.string "{PLAYER}, you need more practice.\p"
.string "But hey, you know that!\n"
.string "I'm out of here. Smell ya!$"
Text_18843C:: @ 818843C
.string "The sea cleanses my body and soul!$"
@ Translated in RB as "{RIVAL}: Hahaha! {PLAYER}! That's your best? You're nowhere near as good as me, pal! Go train some more! You loser!"
Route22_Text_LateRivalVictory:: @ 8188BAF
.string "{RIVAL}“ひゃははッ　{PLAYER}ー！\n"
.string "それで　がんばってるのかよ！\l"
.string "おれの　さいのうに　くらべりゃ\l"
.string "{PLAYER}は　まだまだ　だな！\p"
.string "もっと　れんしゅう　こいよ！\n"
.string "あははーッ！$"
Text_18845F:: @ 818845F
.string "Ayah!$"
Text_188465:: @ 8188465
.string "The sea is great and all, but I\n"
.string "like the mountains, too.$"
Text_18849E:: @ 818849E
.string "おれだって　たまには\n"
.string "およぎに　くるぜ！$"
Text_1884B3:: @ 81884B3
.string "ぐわわ！$"
Text_1884B8:: @ 81884B8
.string "うきやすそう　だと？\n"
.string "うるせー　おおきな　おせわだッ！$"
Text_1884D4:: @ 81884D4
.string "I caught my POKéMON at sea.$"
Text_1884F0:: @ 81884F0
.string "Diver!!\n"
.string "Down!!$"
Text_1884FF:: @ 81884FF
.string "Where'd you catch your POKéMON?$"
Text_18851F:: @ 818851F
.string "Right now, I'm in a triathlon meet.$"
Text_188543:: @ 8188543
.string "Pant…\n"
.string "Pant… Pant…$"
Text_188555:: @ 8188555
.string "I'm beat! But, I still have the\n"
.string "bike race and marathon left!$"
Text_188592:: @ 8188592
.string "Ahh!\n"
.string "Feel the sun and the wind!$"
Text_1885B2:: @ 81885B2
.string "Yow!\n"
.string "I lost!$"
Text_1885BF:: @ 81885BF
.string "I'm sunburnt to a crisp!$"
Text_1885D8:: @ 81885D8
.string "Hey, don't scare away the fish!$"
Text_1885F8:: @ 81885F8
.string "Sorry! I'm just so frustrated from\n"
.string "not catching anything.$"
Text_188632:: @ 8188632
.string "Sheesh, I haven't caught a thing.\n"
.string "Could this place actually be a\l"
.string "giant pool or something?$"
Text_18868C:: @ 818868C
.string "Keep me company till I get a hit.$"
Text_1886AE:: @ 81886AE
.string "That burned some time.$"
Text_1886C5:: @ 81886C5
.string "Oh wait!\n"
.string "I got a bite! Yeah!$"
Text_1886E2:: @ 81886E2
.string "LIL: Huh? A battle?\n"
.string "IAN, can't you do it alone?$"
Text_188712:: @ 8188712
.string "LIL: Oh, see?\n"
.string "We lost. Happy now?$"
Text_188734:: @ 8188734
.string "LIL: I'm tired.\n"
.string "Can't we go home already?$"
Text_18875E:: @ 818875E
.string "LIL: Huh? A battle?\n"
.string "I can't be bothered to do it alone.\l"
.string "Bring two POKéMON, won't you?$"
Text_1887B4:: @ 81887B4
.string "IAN: My sis doesn't get enough\n"
.string "exercise, so I made her come.$"
Text_1887F1:: @ 81887F1
.string "IAN: Awww, Sis!\n"
.string "Get it together!$"
Text_188812:: @ 8188812
.string "IAN: Come on, Sis!\p"
.string "You're not going to lose weight\n"
.string "like this!$"
Text_188850:: @ 8188850
.string "IAN: We want a two-on-two battle.\n"
.string "So can you bring two POKéMON?$"
gUnknown_8188890:: @ 8188890
.string "{RIVAL}: Hey! {PLAYER}!\p"
.string "You're off to the POKéMON LEAGUE?\n"
.string "Forget about it!\p"
.string "You probably don't have any\n"
.string "BADGES, do you?\p"
.string "The guard won't let you through\n"
.string "without them.\p"
.string "By the way, did your POKéMON get\n"
.string "any stronger?$"
Text_188959:: @ 8188959
.string "Awww!\n"
.string "You just lucked out!$"
gUnknown_8188974:: @ 8188974
.string "I heard the POKéMON LEAGUE is\n"
.string "crawling with tough TRAINERS.\p"
.string "I have to figure out how to get\n"
.string "past them.\p"
.string "You should quit dawdling and get a\n"
.string "move on!$"
Text_188A07:: @ 8188A07
.string "{RIVAL}“なんだ？\n"
.string "ポケモン　2ひきも\l"
.string "もってるの　なぜか　だって？\p"
.string "おまえも\n"
.string "つかまえれば　いい　じゃん！$"
gUnknown_8188A3C:: @ 8188A3C
.string "{RIVAL}: What? {PLAYER}!\n"
.string "What a surprise to see you here!\p"
.string "So you're going to the POKéMON\n"
.string "LEAGUE?\p"
.string "You collected all the BADGES, too?\n"
.string "That's cool!\p"
.string "Then I'll whip you, {PLAYER}, as a\n"
.string "warm-up for the POKéMON LEAGUE!\p"
.string "Come on!$"
Text_188B08:: @ 8188B08
.string "What!?\p"
.string "I was just careless, you!$"
gUnknown_8188B29:: @ 8188B29
.string "That loosened me up.\n"
.string "I'm ready for the POKéMON LEAGUE!\p"
.string "{PLAYER}, you need more practice.\p"
.string "But hey, you know that!\n"
.string "I'm out of here. Smell ya!$"
Text_188BAF:: @ 8188BAF
.string "{RIVAL}“ひゃははッ　{PLAYER}ー！\n"
.string "それで　がんばってるのかよ！\l"
.string "おれの　さいのうに　くらべりゃ\l"
.string "{PLAYER}は　まだまだ　だな！\p"
.string "もっと　れんしゅう　こいよ！\n"
.string "あははーッ！$"
gUnknown_8188BFF:: @ 8188BFF
.string "POKéMON LEAGUE\n"
.string "Front Gate$"
Route22_Text_LeagueGateSign:: @ 8188BFF
.string "POKéMON LEAGUE\n"
.string "Front Gate$"
data/maps/Route2_EastBuilding/map.json
+2 -2
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_EastBuilding_EventScript_16F67F",
"script": "Route2_EastBuilding_EventScript_Aide",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_EastBuilding_EventScript_16F714",
"script": "Route2_EastBuilding_EventScript_Rocker",
"flag": "0"
}
],
data/maps/Route2_EastBuilding/scripts.inc
+20 -18
View File
@@ -1,40 +1,42 @@
.equ REQUIRED_SEEN_MONS, 10
Route2_EastBuilding_MapScripts:: @ 816F67E
.byte 0
Route2_EastBuilding_EventScript_16F67F:: @ 816F67F
Route2_EastBuilding_EventScript_Aide:: @ 816F67F
lock
faceplayer
call EventScript_16F70B
goto_if_set FLAG_GOT_HM05, EventScript_16F701
msgbox gUnknown_819D64F, MSGBOX_YESNO
call Route2_EastBuilding_EventScript_GetAideRequestInfo
goto_if_set FLAG_GOT_HM05, Route2_EastBuilding_EventScript_AlreadyGotHM05
msgbox Route2_EastBuilding_Text_GiveHM05IfSeen10Mons, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1A7AD1
goto_if_eq Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
getnumberstring 2, VAR_0x8006
call EventScript_16F70B
compare VAR_0x8006, 10
goto_if_lt EventScript_1A7ABD
msgbox gUnknown_819D74E
call Route2_EastBuilding_EventScript_GetAideRequestInfo
compare VAR_0x8006, REQUIRED_SEEN_MONS
goto_if_lt Aide_EventScript_HaventCaughtEnough
msgbox Route2_EastBuilding_Text_GreatHereYouGo
checkitemspace ITEM_HM05, 1
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1A7AC7
giveitem_msg gUnknown_819D7A1, ITEM_HM05
goto_if_eq Aide_EventScript_NoRoomForItem
giveitem_msg Route2_EastBuilding_Text_ReceivedHM05FromAide, ITEM_HM05
setflag FLAG_GOT_HM05
msgbox gUnknown_819D7C1
msgbox Route2_EastBuilding_Text_ExplainHM05
release
end
EventScript_16F701:: @ 816F701
msgbox gUnknown_819D7C1
Route2_EastBuilding_EventScript_AlreadyGotHM05:: @ 816F701
msgbox Route2_EastBuilding_Text_ExplainHM05
release
end
EventScript_16F70B:: @ 816F70B
getnumberstring 0, 10
Route2_EastBuilding_EventScript_GetAideRequestInfo:: @ 816F70B
getnumberstring 0, REQUIRED_SEEN_MONS
getitemname 1, ITEM_HM05
return
Route2_EastBuilding_EventScript_16F714:: @ 816F714
msgbox gUnknown_819D81E, MSGBOX_NPC
Route2_EastBuilding_EventScript_Rocker:: @ 816F714
msgbox Route2_EastBuilding_Text_CanGetThroughRockTunnel, MSGBOX_NPC
end
data/maps/Route2_EastBuilding/text.inc
+5 -5
View File
@@ -1,4 +1,4 @@
gUnknown_819D64F:: @ 819D64F
Route2_EastBuilding_Text_GiveHM05IfSeen10Mons:: @ 819D64F
.string "Hi! Remember me?\n"
.string "I'm one of PROF. OAK's AIDES.\p"
.string "If your POKéDEX has complete data\n"
@@ -10,23 +10,23 @@ gUnknown_819D64F:: @ 819D64F
.string "Have you gathered data on at least\n"
.string "ten kinds of POKéMON?$"
gUnknown_819D74E:: @ 819D74E
Route2_EastBuilding_Text_GreatHereYouGo:: @ 819D74E
.string "Great! You have caught or owned\n"
.string "{STR_VAR_3} kinds of POKéMON!\p"
.string "Congratulations!\n"
.string "Here you go!$"
gUnknown_819D7A1:: @ 819D7A1
Route2_EastBuilding_Text_ReceivedHM05FromAide:: @ 819D7A1
.string "{PLAYER} received HM05\n"
.string "from the AIDE.$"
gUnknown_819D7C1:: @ 819D7C1
Route2_EastBuilding_Text_ExplainHM05:: @ 819D7C1
.string "HM05 contains the hidden move\n"
.string "FLASH.\p"
.string "FLASH lights up even the darkest\n"
.string "of caves and dungeons.$"
gUnknown_819D81E:: @ 819D81E
Route2_EastBuilding_Text_CanGetThroughRockTunnel:: @ 819D81E
.string "Once a POKéMON learns FLASH, you\n"
.string "can get through ROCK TUNNEL.$"
data/maps/Route2_House/map.json
+2 -2
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_House_EventScript_16F5F9",
"script": "Route2_House_EventScript_Scientist",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_House_EventScript_16F602",
"script": "Route2_House_EventScript_Reyley",
"flag": "0"
}
],
data/maps/Route2_House/scripts.inc
+10 -10
View File
@@ -1,43 +1,43 @@
Route2_House_MapScripts:: @ 816F5F8
.byte 0
Route2_House_EventScript_16F5F9:: @ 816F5F9
msgbox gUnknown_819D5E7, MSGBOX_NPC
Route2_House_EventScript_Scientist:: @ 816F5F9
msgbox Route2_House_Text_FaintedMonsCanUseFieldMoves, MSGBOX_NPC
end
Route2_House_EventScript_16F602:: @ 816F602
Route2_House_EventScript_Reyley:: @ 816F602
lock
faceplayer
setvar VAR_0x8008, INGAME_TRADE_MR_MIME
call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_MIMIEN_TRADE, EventScript_16F674
goto_if_set FLAG_DID_MIMIEN_TRADE, Route2_House_EventScript_AlreadyTraded
msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16F65C
goto_if_eq Route2_House_EventScript_DeclineTrade
call EventScript_ChooseMonForInGameTrade
compare VAR_0x8004, PARTY_SIZE
goto_if_ge EventScript_16F65C
goto_if_ge Route2_House_EventScript_DeclineTrade
call EventScript_GetInGameTradeSpecies
compare VAR_RESULT, VAR_0x8009
goto_if_ne EventScript_16F666
goto_if_ne Route2_House_EventScript_NotRequestedMon
call EventScript_DoInGameTrade
msgbox Trade_Text_HeyThanks
setflag FLAG_DID_MIMIEN_TRADE
release
end
EventScript_16F65C:: @ 816F65C
Route2_House_EventScript_DeclineTrade:: @ 816F65C
msgbox Trade_Text_AwwOhWell
release
end
EventScript_16F666:: @ 816F666
Route2_House_EventScript_NotRequestedMon:: @ 816F666
getspeciesname 0, VAR_0x8009
msgbox Trade_Text_WhatThatsNoMon
release
end
EventScript_16F674:: @ 816F674
Route2_House_EventScript_AlreadyTraded:: @ 816F674
msgbox Trade_Text_IsntMyOldMonGreat
release
end
data/maps/Route2_House/text.inc
+1 -1
View File
@@ -1,4 +1,4 @@
gUnknown_819D5E7:: @ 819D5E7
Route2_House_Text_FaintedMonsCanUseFieldMoves:: @ 819D5E7
.string "A fainted POKéMON just has no\n"
.string "energy left to battle.\p"
.string "It can still use moves like CUT\n"
data/maps/Route2_ViridianForest_NorthEntrance/map.json
+3 -3
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_ViridianForest_NorthEntrance_EventScript_16F71E",
"script": "Route2_ViridianForest_NorthEntrance_EventScript_Youngster",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_ViridianForest_NorthEntrance_EventScript_16F727",
"script": "Route2_ViridianForest_NorthEntrance_EventScript_OldMan",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_ViridianForest_NorthEntrance_EventScript_16F730",
"script": "Route2_ViridianForest_NorthEntrance_EventScript_CooltrainerF",
"flag": "0"
}
],
data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc
+6 -6
View File
@@ -1,14 +1,14 @@
Route2_ViridianForest_NorthEntrance_MapScripts:: @ 816F71D
.byte 0
Route2_ViridianForest_NorthEntrance_EventScript_16F71E:: @ 816F71E
msgbox gUnknown_819D85C, MSGBOX_NPC
Route2_ViridianForest_NorthEntrance_EventScript_Youngster:: @ 816F71E
msgbox Route2_ViridianForest_NorthEntrance_Text_ManyMonsOnlyInForests, MSGBOX_NPC
end
Route2_ViridianForest_NorthEntrance_EventScript_16F727:: @ 816F727
msgbox gUnknown_819D8D0, MSGBOX_NPC
Route2_ViridianForest_NorthEntrance_EventScript_OldMan:: @ 816F727
msgbox Route2_ViridianForest_NorthEntrance_Text_CanCutSkinnyTrees, MSGBOX_NPC
end
Route2_ViridianForest_NorthEntrance_EventScript_16F730:: @ 816F730
msgbox gUnknown_819D93B, MSGBOX_NPC
Route2_ViridianForest_NorthEntrance_EventScript_CooltrainerF:: @ 816F730
msgbox Route2_ViridianForest_NorthEntrance_Text_CanCancelEvolution, MSGBOX_NPC
end
data/maps/Route2_ViridianForest_NorthEntrance/text.inc
+3 -3
View File
@@ -1,16 +1,16 @@
gUnknown_819D85C:: @ 819D85C
Route2_ViridianForest_NorthEntrance_Text_ManyMonsOnlyInForests:: @ 819D85C
.string "Many POKéMON live only in forests \n"
.string "and caves.\p"
.string "You need to be persistent and look\n"
.string "everywhere to get different kinds.$"
gUnknown_819D8D0:: @ 819D8D0
Route2_ViridianForest_NorthEntrance_Text_CanCutSkinnyTrees:: @ 819D8D0
.string "Have you noticed the skinny trees\n"
.string "on the roadside?\p"
.string "They can be cut down by a special\n"
.string "POKéMON move, I hear.$"
gUnknown_819D93B:: @ 819D93B
Route2_ViridianForest_NorthEntrance_Text_CanCancelEvolution:: @ 819D93B
.string "Do you know the evolution-cancel\n"
.string "technique?\p"
.string "When a POKéMON is evolving, you\n"
data/maps/Route2_ViridianForest_SouthEntrance/map.json
+2 -2
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_ViridianForest_SouthEntrance_EventScript_16F5E6",
"script": "Route2_ViridianForest_SouthEntrance_EventScript_Woman1",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_ViridianForest_SouthEntrance_EventScript_16F5EF",
"script": "Route2_ViridianForest_SouthEntrance_EventScript_Woman2",
"flag": "0"
}
],
data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc
+4 -4
View File
@@ -1,10 +1,10 @@
Route2_ViridianForest_SouthEntrance_MapScripts:: @ 816F5E5
.byte 0
Route2_ViridianForest_SouthEntrance_EventScript_16F5E6:: @ 816F5E6
msgbox gUnknown_819D52C, MSGBOX_NPC
Route2_ViridianForest_SouthEntrance_EventScript_Woman1:: @ 816F5E6
msgbox Route2_ViridianForest_SouthEntrance_Text_ForestIsMaze, MSGBOX_NPC
end
Route2_ViridianForest_SouthEntrance_EventScript_16F5EF:: @ 816F5EF
msgbox gUnknown_819D58B, MSGBOX_NPC
Route2_ViridianForest_SouthEntrance_EventScript_Woman2:: @ 816F5EF
msgbox Route2_ViridianForest_SouthEntrance_Text_RattataHasWickedBite, MSGBOX_NPC
end
data/maps/Route2_ViridianForest_SouthEntrance/text.inc
+2 -2
View File
@@ -1,9 +1,9 @@
gUnknown_819D52C:: @ 819D52C
Route2_ViridianForest_SouthEntrance_Text_ForestIsMaze:: @ 819D52C
.string "Are you going to VIRIDIAN FOREST?\n"
.string "It's a natural maze in there.\l"
.string "Be careful you don't get lost.$"
gUnknown_819D58B:: @ 819D58B
Route2_ViridianForest_SouthEntrance_Text_RattataHasWickedBite:: @ 819D58B
.string "RATTATA may be small, but don't\n"
.string "underestimate its wicked bite.\p"
.string "Have you caught one already?$"
data/maps/SSAnne_1F_Corridor/map.json
+2 -2
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_1F_Corridor_EventScript_1608D5",
"script": "SSAnne_1F_Corridor_EventScript_Sailor",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_1F_Corridor_EventScript_1608CC",
"script": "SSAnne_1F_Corridor_EventScript_WorkerM",
"flag": "0"
}
],
data/maps/SSAnne_1F_Corridor/scripts.inc
+4 -4
View File
@@ -1,10 +1,10 @@
SSAnne_1F_Corridor_MapScripts:: @ 81608CB
.byte 0
SSAnne_1F_Corridor_EventScript_1608CC:: @ 81608CC
msgbox gUnknown_8172EE7, MSGBOX_NPC
SSAnne_1F_Corridor_EventScript_WorkerM:: @ 81608CC
msgbox SSAnne_1F_Corridor_Text_LeStrongSilentType, MSGBOX_NPC
end
SSAnne_1F_Corridor_EventScript_1608D5:: @ 81608D5
msgbox gUnknown_8172F60, MSGBOX_NPC
SSAnne_1F_Corridor_EventScript_Sailor:: @ 81608D5
msgbox SSAnne_1F_Corridor_Text_PassengersAreRestless, MSGBOX_NPC
end
data/maps/SSAnne_1F_Corridor/text.inc
+2 -2
View File
@@ -1,4 +1,4 @@
gUnknown_8172EE7:: @ 8172EE7
SSAnne_1F_Corridor_Text_LeStrongSilentType:: @ 8172EE7
.string "Bonjour!\n"
.string "I am le waiter on this ship!\p"
.string "I will be happy to serve you\n"
@@ -6,7 +6,7 @@ gUnknown_8172EE7:: @ 8172EE7
.string "… … …\n"
.string "Ah! Le strong silent type!$"
gUnknown_8172F60:: @ 8172F60
SSAnne_1F_Corridor_Text_PassengersAreRestless:: @ 8172F60
.string "The passengers are restless from\n"
.string "this long voyage.\p"
.string "You might be challenged by the\n"
data/maps/SSAnne_1F_Room1/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_1F_Room1_EventScript_160BDC",
"script": "SSAnne_1F_Room1_EventScript_Gentleman",
"flag": "0"
}
],
data/maps/SSAnne_1F_Room1/scripts.inc
+2 -2
View File
@@ -1,6 +1,6 @@
SSAnne_1F_Room1_MapScripts:: @ 8160BDB
.byte 0
SSAnne_1F_Room1_EventScript_160BDC:: @ 8160BDC
msgbox gUnknown_817393B, MSGBOX_NPC
SSAnne_1F_Room1_EventScript_Gentleman:: @ 8160BDC
msgbox SSAnne_1F_Room1_Text_ImAGlobalPoliceAgent, MSGBOX_NPC
end
data/maps/SSAnne_1F_Room1/text.inc
+1 -1
View File
@@ -1,4 +1,4 @@
gUnknown_817393B:: @ 817393B
SSAnne_1F_Room1_Text_ImAGlobalPoliceAgent:: @ 817393B
.string "Ssh…!\n"
.string "I'm a GLOBAL POLICE agent.\p"
.string "I'm on the trail of TEAM ROCKET.\n"
data/maps/SSAnne_1F_Room2/map.json
+3 -3
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
"script": "SSAnne_1F_Room2_EventScript_160BEF",
"script": "SSAnne_1F_Room2_EventScript_Ann",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "SSAnne_1F_Room2_EventScript_160C06",
"script": "SSAnne_1F_Room2_EventScript_Tyler",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 1,
"script": "SSAnne_1F_Room2_EventScript_160BE6",
"script": "SSAnne_1F_Room2_EventScript_Woman",
"flag": "0"
},
{
data/maps/SSAnne_1F_Room2/scripts.inc
+8 -8
View File
@@ -1,16 +1,16 @@
SSAnne_1F_Room2_MapScripts:: @ 8160BE5
.byte 0
SSAnne_1F_Room2_EventScript_160BE6:: @ 8160BE6
msgbox gUnknown_8173AC5, MSGBOX_NPC
SSAnne_1F_Room2_EventScript_Woman:: @ 8160BE6
msgbox SSAnne_1F_Room2_Text_CruisingAroundWorld, MSGBOX_NPC
end
SSAnne_1F_Room2_EventScript_160BEF:: @ 8160BEF
trainerbattle_single TRAINER_LASS_ANN, Text_173A1A, Text_173A4F
msgbox gUnknown_8173A7A, MSGBOX_AUTOCLOSE
SSAnne_1F_Room2_EventScript_Ann:: @ 8160BEF
trainerbattle_single TRAINER_LASS_ANN, SSAnne_1F_Room2_Text_AnnIntro, SSAnne_1F_Room2_Text_AnnDefeat
msgbox SSAnne_1F_Room2_Text_AnnPostBattle, MSGBOX_AUTOCLOSE
end
SSAnne_1F_Room2_EventScript_160C06:: @ 8160C06
trainerbattle_single TRAINER_YOUNGSTER_TYLER, Text_173999, Text_1739B1
msgbox gUnknown_81739C5, MSGBOX_AUTOCLOSE
SSAnne_1F_Room2_EventScript_Tyler:: @ 8160C06
trainerbattle_single TRAINER_YOUNGSTER_TYLER, SSAnne_1F_Room2_Text_TylerIntro, SSAnne_1F_Room2_Text_TylerDefeat
msgbox SSAnne_1F_Room2_Text_TylerPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/SSAnne_1F_Room2/text.inc
+7 -7
View File
@@ -1,31 +1,31 @@
Text_173999:: @ 8173999
SSAnne_1F_Room2_Text_TylerIntro:: @ 8173999
.string "I love POKéMON!\n"
.string "Do you?$"
Text_1739B1:: @ 81739B1
SSAnne_1F_Room2_Text_TylerDefeat:: @ 81739B1
.string "Wow! \n"
.string "You're great!$"
gUnknown_81739C5:: @ 81739C5
SSAnne_1F_Room2_Text_TylerPostBattle:: @ 81739C5
.string "Listen, listen!\n"
.string "Let me be your friend, okay?\p"
.string "Then we can trade POKéMON and\n"
.string "do stuff.$"
Text_173A1A:: @ 8173A1A
SSAnne_1F_Room2_Text_AnnIntro:: @ 8173A1A
.string "I collected these POKéMON\n"
.string "from all around the world!$"
Text_173A4F:: @ 8173A4F
SSAnne_1F_Room2_Text_AnnDefeat:: @ 8173A4F
.string "Oh, no!\n"
.string "I went around the world for these!$"
gUnknown_8173A7A:: @ 8173A7A
SSAnne_1F_Room2_Text_AnnPostBattle:: @ 8173A7A
.string "You hurt my poor POKéMON!\p"
.string "I demand that you heal them at a\n"
.string "POKéMON CENTER!$"
gUnknown_8173AC5:: @ 8173AC5
SSAnne_1F_Room2_Text_CruisingAroundWorld:: @ 8173AC5
.string "We are cruising around the world,\n"
.string "my children and I.$"
data/maps/SSAnne_1F_Room3/map.json
+3 -3
View File
@@ -23,7 +23,7 @@
"movement_range_y": 3,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_1F_Room3_EventScript_160C1E",
"script": "SSAnne_1F_Room3_EventScript_LittleGirl",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_1F_Room3_EventScript_160C30",
"script": "SSAnne_1F_Room3_EventScript_Wigglytuff",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_1F_Room3_EventScript_160C27",
"script": "SSAnne_1F_Room3_EventScript_BaldingMan",
"flag": "0"
}
],
data/maps/SSAnne_1F_Room3/scripts.inc
+6 -6
View File
@@ -1,20 +1,20 @@
SSAnne_1F_Room3_MapScripts:: @ 8160C1D
.byte 0
SSAnne_1F_Room3_EventScript_160C1E:: @ 8160C1E
msgbox gUnknown_8173B21, MSGBOX_NPC
SSAnne_1F_Room3_EventScript_LittleGirl:: @ 8160C1E
msgbox SSAnne_1F_Room3_Text_AlwaysTravelWithWigglytuff, MSGBOX_NPC
end
SSAnne_1F_Room3_EventScript_160C27:: @ 8160C27
msgbox gUnknown_8173AFA, MSGBOX_NPC
SSAnne_1F_Room3_EventScript_BaldingMan:: @ 8160C27
msgbox SSAnne_1F_Room3_Text_CruiseIsElegantAndCozy, MSGBOX_NPC
end
SSAnne_1F_Room3_EventScript_160C30:: @ 8160C30
SSAnne_1F_Room3_EventScript_Wigglytuff:: @ 8160C30
lock
faceplayer
waitse
playmoncry SPECIES_WIGGLYTUFF, 0
msgbox gUnknown_8173B61
msgbox SSAnne_1F_Room3_Text_Wigglytuff
waitmoncry
release
end
data/maps/SSAnne_1F_Room3/text.inc
+3 -3
View File
@@ -1,11 +1,11 @@
gUnknown_8173AFA:: @ 8173AFA
SSAnne_1F_Room3_Text_CruiseIsElegantAndCozy:: @ 8173AFA
.string "A world cruise is so elegant yet\n"
.string "cozy!$"
gUnknown_8173B21:: @ 8173B21
SSAnne_1F_Room3_Text_AlwaysTravelWithWigglytuff:: @ 8173B21
.string "I always travel with WIGGLYTUFF.\n"
.string "I never leave home without it.$"
gUnknown_8173B61:: @ 8173B61
SSAnne_1F_Room3_Text_Wigglytuff:: @ 8173B61
.string "WIGGLYTUFF: Puup pupuu!$"
data/maps/SSAnne_1F_Room4/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_1F_Room4_EventScript_160C44",
"script": "SSAnne_1F_Room4_EventScript_Woman",
"flag": "0"
}
],
data/maps/SSAnne_1F_Room4/scripts.inc
+5 -5
View File
@@ -1,17 +1,17 @@
SSAnne_1F_Room4_MapScripts:: @ 8160C43
.byte 0
SSAnne_1F_Room4_EventScript_160C44:: @ 8160C44
SSAnne_1F_Room4_EventScript_Woman:: @ 8160C44
lock
faceplayer
checkplayergender
compare VAR_RESULT, MALE
goto_if_eq EventScript_160C5C
msgbox gUnknown_8173BA4
goto_if_eq SSAnne_1F_Room4_EventScript_WomanPlayerMale
msgbox SSAnne_1F_Room4_Text_WaitressCherryPiePlease
release
end
EventScript_160C5C:: @ 8160C5C
msgbox gUnknown_8173B79
SSAnne_1F_Room4_EventScript_WomanPlayerMale:: @ 8160C5C
msgbox SSAnne_1F_Room4_Text_WaiterCherryPiePlease
release
end
data/maps/SSAnne_1F_Room4/text.inc
+2 -2
View File
@@ -1,8 +1,8 @@
gUnknown_8173B79:: @ 8173B79
SSAnne_1F_Room4_Text_WaiterCherryPiePlease:: @ 8173B79
.string "Waiter, I would like a cherry pie,\n"
.string "please!$"
gUnknown_8173BA4:: @ 8173BA4
SSAnne_1F_Room4_Text_WaitressCherryPiePlease:: @ 8173BA4
.string "Waitress, I would like a cherry\n"
.string "pie, please!$"
data/maps/SSAnne_1F_Room5/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
"script": "SSAnne_1F_Room5_EventScript_160C67",
"script": "SSAnne_1F_Room5_EventScript_Arthur",
"flag": "0"
}
],
data/maps/SSAnne_1F_Room5/scripts.inc
+3 -3
View File
@@ -1,7 +1,7 @@
SSAnne_1F_Room5_MapScripts:: @ 8160C66
.byte 0
SSAnne_1F_Room5_EventScript_160C67:: @ 8160C67
trainerbattle_single TRAINER_GENTLEMAN_ARTHUR, Text_173BD1, Text_173BFA
msgbox gUnknown_8173C30, MSGBOX_AUTOCLOSE
SSAnne_1F_Room5_EventScript_Arthur:: @ 8160C67
trainerbattle_single TRAINER_GENTLEMAN_ARTHUR, SSAnne_1F_Room5_Text_ArthurIntro, SSAnne_1F_Room5_Text_ArthurDefeat
msgbox SSAnne_1F_Room5_Text_ArthurPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/SSAnne_1F_Room5/text.inc
+3 -3
View File
@@ -1,12 +1,12 @@
Text_173BD1:: @ 8173BD1
SSAnne_1F_Room5_Text_ArthurIntro:: @ 8173BD1
.string "You insolent pup!\n"
.string "How dare you barge in!$"
Text_173BFA:: @ 8173BFA
SSAnne_1F_Room5_Text_ArthurDefeat:: @ 8173BFA
.string "Humph! You rude child!\n"
.string "You have no sense of courtesy!$"
gUnknown_8173C30:: @ 8173C30
SSAnne_1F_Room5_Text_ArthurPostBattle:: @ 8173C30
.string "I wish to be left alone!\n"
.string "Get out!$"
data/maps/SSAnne_1F_Room6/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_1F_Room6_EventScript_160DF3",
"script": "SSAnne_1F_Room6_EventScript_Woman",
"flag": "0"
}
],
data/maps/SSAnne_1F_Room6/scripts.inc
+9 -9
View File
@@ -1,27 +1,27 @@
SSAnne_1F_Room6_MapScripts:: @ 8160DF2
.byte 0
SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3
SSAnne_1F_Room6_EventScript_Woman:: @ 8160DF3
lock
faceplayer
msgbox gUnknown_817445B, MSGBOX_YESNO
msgbox SSAnne_1F_Room6_Text_TakeAShortRest, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_160E18
goto_if_eq SSAnne_1F_Room6_EventScript_DeclineHeal
closemessage
call EventScript_OutOfCenterPartyHeal
msgbox gUnknown_8174490
msgbox SSAnne_1F_Room6_Text_GladEveryoneIsRefreshed
release
end
EventScript_160E18:: @ 8160E18
SSAnne_1F_Room6_EventScript_DeclineHeal:: @ 8160E18
checkplayergender
compare VAR_RESULT, MALE
goto_if_eq EventScript_160E2E
msgbox gUnknown_8174515
goto_if_eq SSAnne_1F_Room6_EventScript_DeclineHealMale
msgbox SSAnne_1F_Room6_Text_SorryYouLookLikeMySister
release
end
EventScript_160E2E:: @ 8160E2E
msgbox gUnknown_81744D0
SSAnne_1F_Room6_EventScript_DeclineHealMale:: @ 8160E2E
msgbox SSAnne_1F_Room6_Text_SorryYouLookLikeMyBrother
release
end
data/maps/SSAnne_1F_Room6/text.inc
+4 -4
View File
@@ -1,16 +1,16 @@
gUnknown_817445B:: @ 817445B
SSAnne_1F_Room6_Text_TakeAShortRest:: @ 817445B
.string "You look tired. Would you like to\n"
.string "take a short rest?$"
gUnknown_8174490:: @ 8174490
SSAnne_1F_Room6_Text_GladEveryoneIsRefreshed:: @ 8174490
.string "I'm glad to see that everyone is\n"
.string "looking refreshed and chipper.$"
gUnknown_81744D0:: @ 81744D0
SSAnne_1F_Room6_Text_SorryYouLookLikeMyBrother:: @ 81744D0
.string "Oh, I'm sorry for fussing over you.\n"
.string "You look like my little brother…$"
gUnknown_8174515:: @ 8174515
SSAnne_1F_Room6_Text_SorryYouLookLikeMySister:: @ 8174515
.string "Oh, I'm sorry for fussing over you.\n"
.string "You look like my little sister…$"
data/maps/SSAnne_1F_Room7/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "SSAnne_1F_Room7_EventScript_160C7F",
"script": "SSAnne_1F_Room7_EventScript_Thomas",
"flag": "0"
}
],
data/maps/SSAnne_1F_Room7/scripts.inc
+3 -3
View File
@@ -1,7 +1,7 @@
SSAnne_1F_Room7_MapScripts:: @ 8160C7E
.byte 0
SSAnne_1F_Room7_EventScript_160C7F:: @ 8160C7F
trainerbattle_single TRAINER_GENTLEMAN_THOMAS, Text_173C52, Text_173CB4
msgbox gUnknown_8173CC4, MSGBOX_AUTOCLOSE
SSAnne_1F_Room7_EventScript_Thomas:: @ 8160C7F
trainerbattle_single TRAINER_GENTLEMAN_THOMAS, SSAnne_1F_Room7_Text_ThomasIntro, SSAnne_1F_Room7_Text_ThomasDefeat
msgbox SSAnne_1F_Room7_Text_ThomasPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/SSAnne_1F_Room7/text.inc
+3 -3
View File
@@ -1,11 +1,11 @@
Text_173C52:: @ 8173C52
SSAnne_1F_Room7_Text_ThomasIntro:: @ 8173C52
.string "I am but a solitary traveler…\p"
.string "My sole companions and friends are\n"
.string "POKéMON I caught on my journeys…$"
Text_173CB4:: @ 8173CB4
SSAnne_1F_Room7_Text_ThomasDefeat:: @ 8173CB4
.string "My, my friends…$"
gUnknown_8173CC4:: @ 8173CC4
SSAnne_1F_Room7_Text_ThomasPostBattle:: @ 8173CC4
.string "You should be nice to friends!$"
data/maps/SSAnne_2F_Corridor/map.json
+4 -4
View File
@@ -36,7 +36,7 @@
"movement_range_y": 2,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_2F_Corridor_EventScript_160A54",
"script": "SSAnne_2F_Corridor_EventScript_Sailor",
"flag": "0"
}
],
@@ -113,7 +113,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR",
"var_value": 0,
"script": "SSAnne_2F_Corridor_EventScript_1608DF"
"script": "SSAnne_2F_Corridor_EventScript_RivalTriggerLeft"
},
{
"type": "trigger",
@@ -122,7 +122,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR",
"var_value": 0,
"script": "SSAnne_2F_Corridor_EventScript_1608EB"
"script": "SSAnne_2F_Corridor_EventScript_RivalTriggerMid"
},
{
"type": "trigger",
@@ -131,7 +131,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR",
"var_value": 0,
"script": "SSAnne_2F_Corridor_EventScript_1608F7"
"script": "SSAnne_2F_Corridor_EventScript_RivalTriggerRight"
}
],
"bg_events": []
data/maps/SSAnne_2F_Corridor/scripts.inc
+48 -54
View File
@@ -1,31 +1,25 @@
SSAnne_2F_Corridor_MapScripts:: @ 81608DE
.byte 0
SSAnne_2F_Corridor_EventScript_1608DF:: @ 81608DF
SSAnne_2F_Corridor_EventScript_RivalTriggerLeft:: @ 81608DF
lockall
setvar VAR_TEMP_1, 0
goto EventScript_160903
EventScript_1608EA:: @ 81608EA
goto SSAnne_2F_Corridor_EventScript_RivalTrigger
end
SSAnne_2F_Corridor_EventScript_1608EB:: @ 81608EB
SSAnne_2F_Corridor_EventScript_RivalTriggerMid:: @ 81608EB
lockall
setvar VAR_TEMP_1, 1
goto EventScript_160903
EventScript_1608F6:: @ 81608F6
goto SSAnne_2F_Corridor_EventScript_RivalTrigger
end
SSAnne_2F_Corridor_EventScript_1608F7:: @ 81608F7
SSAnne_2F_Corridor_EventScript_RivalTriggerRight:: @ 81608F7
lockall
setvar VAR_TEMP_1, 2
goto EventScript_160903
EventScript_160902:: @ 8160902
goto SSAnne_2F_Corridor_EventScript_RivalTrigger
end
EventScript_160903:: @ 8160903
SSAnne_2F_Corridor_EventScript_RivalTrigger:: @ 8160903
textcolor 0
playse SE_KAIDAN
delay 5
@@ -36,80 +30,80 @@ EventScript_160903:: @ 8160903
waitmovement 0
delay 20
compare VAR_TEMP_1, 0
call_if_eq EventScript_1609AD
call_if_eq SSAnne_2F_Corridor_EventScript_RivalApproachLeft
compare VAR_TEMP_1, 1
call_if_eq EventScript_1609B8
call_if_eq SSAnne_2F_Corridor_EventScript_RivalApproachMid
compare VAR_TEMP_1, 2
call_if_eq EventScript_1609CA
msgbox gUnknown_8173035
call_if_eq SSAnne_2F_Corridor_EventScript_RivalApproachRight
msgbox SSAnne_2F_Corridor_Text_RivalIntro
setvar VAR_LAST_TALKED, 1
compare VAR_STARTER_MON, 2
call_if_eq EventScript_1609DC
call_if_eq SSAnne_2F_Corridor_EventScript_RivalSquirtle
compare VAR_STARTER_MON, 1
call_if_eq EventScript_1609E7
call_if_eq SSAnne_2F_Corridor_EventScript_RivalBulbasaur
compare VAR_STARTER_MON, 0
call_if_eq EventScript_1609F2
msgbox gUnknown_8173164
call_if_eq SSAnne_2F_Corridor_EventScript_RivalCharmander
msgbox SSAnne_2F_Corridor_Text_RivalPostBattle
closemessage
delay 10
playbgm MUS_RIVAL2, 0
compare VAR_TEMP_1, 0
call_if_eq EventScript_1609FD
call_if_eq SSAnne_2F_Corridor_EventScript_RivalExitLeft
compare VAR_TEMP_1, 1
call_if_eq EventScript_160A08
call_if_eq SSAnne_2F_Corridor_EventScript_RivalExitMid
compare VAR_TEMP_1, 2
call_if_eq EventScript_160A13
call_if_eq SSAnne_2F_Corridor_EventScript_RivalExitRight
fadedefaultbgm
removeobject 1
setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1
releaseall
end
EventScript_1609AD:: @ 81609AD
applymovement 1, Movement_160A2A
SSAnne_2F_Corridor_EventScript_RivalApproachLeft:: @ 81609AD
applymovement 1, SSAnne_2F_Corridor_Movement_RivalApproachLeft
waitmovement 0
return
EventScript_1609B8:: @ 81609B8
applymovement 1, Movement_160A2E
applymovement OBJ_EVENT_ID_PLAYER, Movement_160A24
SSAnne_2F_Corridor_EventScript_RivalApproachMid:: @ 81609B8
applymovement 1, SSAnne_2F_Corridor_Movement_RivalApproachMid
applymovement OBJ_EVENT_ID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid
waitmovement 0
return
EventScript_1609CA:: @ 81609CA
applymovement OBJ_EVENT_ID_PLAYER, Movement_160A1E
applymovement 1, Movement_160A34
SSAnne_2F_Corridor_EventScript_RivalApproachRight:: @ 81609CA
applymovement OBJ_EVENT_ID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight
applymovement 1, SSAnne_2F_Corridor_Movement_RivalApproachRight
waitmovement 0
return
EventScript_1609DC:: @ 81609DC
trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_SQUIRTLE, Text_173110
SSAnne_2F_Corridor_EventScript_RivalSquirtle:: @ 81609DC
trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_SQUIRTLE, SSAnne_2F_Corridor_Text_RivalDefeat
return
EventScript_1609E7:: @ 81609E7
trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_BULBASAUR, Text_173110
SSAnne_2F_Corridor_EventScript_RivalBulbasaur:: @ 81609E7
trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_BULBASAUR, SSAnne_2F_Corridor_Text_RivalDefeat
return
EventScript_1609F2:: @ 81609F2
trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_CHARMANDER, Text_173110
SSAnne_2F_Corridor_EventScript_RivalCharmander:: @ 81609F2
trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_CHARMANDER, SSAnne_2F_Corridor_Text_RivalDefeat
return
EventScript_1609FD:: @ 81609FD
applymovement 1, Movement_160A3B
SSAnne_2F_Corridor_EventScript_RivalExitLeft:: @ 81609FD
applymovement 1, SSAnne_2F_Corridor_Movement_RivalExitLeft
waitmovement 0
return
EventScript_160A08:: @ 8160A08
applymovement 1, Movement_160A44
SSAnne_2F_Corridor_EventScript_RivalExitMid:: @ 8160A08
applymovement 1, SSAnne_2F_Corridor_Movement_RivalExitMid
waitmovement 0
return
EventScript_160A13:: @ 8160A13
applymovement 1, Movement_160A4C
SSAnne_2F_Corridor_EventScript_RivalExitRight:: @ 8160A13
applymovement 1, SSAnne_2F_Corridor_Movement_RivalExitRight
waitmovement 0
return
Movement_160A1E:: @ 8160A1E
SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight:: @ 8160A1E
delay_16
delay_16
delay_16
@@ -117,7 +111,7 @@ Movement_160A1E:: @ 8160A1E
walk_in_place_fastest_left
step_end
Movement_160A24:: @ 8160A24
SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid:: @ 8160A24
delay_16
delay_16
delay_16
@@ -125,13 +119,13 @@ Movement_160A24:: @ 8160A24
walk_in_place_fastest_left
step_end
Movement_160A2A:: @ 8160A2A
SSAnne_2F_Corridor_Movement_RivalApproachLeft:: @ 8160A2A
walk_down
walk_down
walk_down
step_end
Movement_160A2E:: @ 8160A2E
SSAnne_2F_Corridor_Movement_RivalApproachMid:: @ 8160A2E
walk_down
walk_down
walk_down
@@ -139,7 +133,7 @@ Movement_160A2E:: @ 8160A2E
walk_in_place_fastest_right
step_end
Movement_160A34:: @ 8160A34
SSAnne_2F_Corridor_Movement_RivalApproachRight:: @ 8160A34
walk_down
walk_down
walk_down
@@ -148,7 +142,7 @@ Movement_160A34:: @ 8160A34
delay_4
step_end
Movement_160A3B:: @ 8160A3B
SSAnne_2F_Corridor_Movement_RivalExitLeft:: @ 8160A3B
walk_right
walk_down
walk_down
@@ -159,7 +153,7 @@ Movement_160A3B:: @ 8160A3B
walk_down
step_end
Movement_160A44:: @ 8160A44
SSAnne_2F_Corridor_Movement_RivalExitMid:: @ 8160A44
walk_down
walk_down
walk_down
@@ -169,7 +163,7 @@ Movement_160A44:: @ 8160A44
walk_down
step_end
Movement_160A4C:: @ 8160A4C
SSAnne_2F_Corridor_Movement_RivalExitRight:: @ 8160A4C
walk_down
walk_down
walk_down
@@ -179,6 +173,6 @@ Movement_160A4C:: @ 8160A4C
walk_down
step_end
SSAnne_2F_Corridor_EventScript_160A54:: @ 8160A54
msgbox gUnknown_8172FC3, MSGBOX_NPC
SSAnne_2F_Corridor_EventScript_Sailor:: @ 8160A54
msgbox SSAnne_2F_Corridor_Text_ThisShipIsLuxuryLiner, MSGBOX_NPC
end
data/maps/SSAnne_2F_Corridor/text.inc
+5 -5
View File
@@ -1,10 +1,10 @@
gUnknown_8172FC3:: @ 8172FC3
SSAnne_2F_Corridor_Text_ThisShipIsLuxuryLiner:: @ 8172FC3
.string "This ship, she is a luxury liner for\n"
.string "TRAINERS of the world!\p"
.string "At every port, we hold parties with\n"
.string "invited TRAINERS.$"
gUnknown_8173035:: @ 8173035
SSAnne_2F_Corridor_Text_RivalIntro:: @ 8173035
.string "{RIVAL}: Bonjour!\n"
.string "{PLAYER}!\p"
.string "Imagine seeing you here!\n"
@@ -15,18 +15,18 @@ gUnknown_8173035:: @ 8173035
.string "Crawl around in grassy areas, and\n"
.string "look hard for them.$"
Text_173110:: @ 8173110
SSAnne_2F_Corridor_Text_RivalDefeat:: @ 8173110
.string "Humph!\p"
.string "At least you're raising your\n"
.string "POKéMON!$"
Text_17313D:: @ 817313D
SSAnne_2F_Corridor_Text_RivalVictory:: @ 817313D
.string "{PLAYER}‥！\n"
.string "ふなよい　してるのか！\p"
.string "もっと　からだ\n"
.string "きたえた　ほうが　いいぜ！$"
gUnknown_8173164:: @ 8173164
SSAnne_2F_Corridor_Text_RivalPostBattle:: @ 8173164
.string "{RIVAL}: I heard there was a CUT\n"
.string "master on board.\p"
.string "But he was just a seasick old man!\p"
data/maps/SSAnne_2F_Room1/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_2F_Room1_EventScript_160C97",
"script": "SSAnne_2F_Room1_EventScript_Gentleman",
"flag": "0"
}
],
data/maps/SSAnne_2F_Room1/scripts.inc
+2 -2
View File
@@ -1,10 +1,10 @@
SSAnne_2F_Room1_MapScripts:: @ 8160C96
.byte 0
SSAnne_2F_Room1_EventScript_160C97:: @ 8160C97
SSAnne_2F_Room1_EventScript_Gentleman:: @ 8160C97
lock
faceplayer
message Text_173CE3
message SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis
waitmessage
setvar VAR_0x8004, SPECIES_SNORLAX
special Special_SetSeenMon
data/maps/SSAnne_2F_Room1/text.inc
+1 -1
View File
@@ -1,4 +1,4 @@
Text_173CE3:: @ 8173CE3
SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis:: @ 8173CE3
.string "I've journeyed far and wide, but in\n"
.string "all my travels I've never seen\l"
.string "any POKéMON sleep like this one!\p"
data/maps/SSAnne_2F_Room2/map.json
+2 -2
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "SSAnne_2F_Room2_EventScript_160CB1",
"script": "SSAnne_2F_Room2_EventScript_Dale",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
"script": "SSAnne_2F_Room2_EventScript_160CC8",
"script": "SSAnne_2F_Room2_EventScript_Brooks",
"flag": "0"
},
{
data/maps/SSAnne_2F_Room2/scripts.inc
+6 -6
View File
@@ -1,12 +1,12 @@
SSAnne_2F_Room2_MapScripts:: @ 8160CB0
.byte 0
SSAnne_2F_Room2_EventScript_160CB1:: @ 8160CB1
trainerbattle_single TRAINER_FISHERMAN_DALE, Text_173DDB, Text_173DF7
msgbox gUnknown_8173E04, MSGBOX_AUTOCLOSE
SSAnne_2F_Room2_EventScript_Dale:: @ 8160CB1
trainerbattle_single TRAINER_FISHERMAN_DALE, SSAnne_2F_Room2_Text_DaleIntro, SSAnne_2F_Room2_Text_DaleDefeat
msgbox SSAnne_2F_Room2_Text_DalePostBattle, MSGBOX_AUTOCLOSE
end
SSAnne_2F_Room2_EventScript_160CC8:: @ 8160CC8
trainerbattle_single TRAINER_GENTLEMAN_BROOKS, Text_173D63, Text_173D92
msgbox gUnknown_8173DB6, MSGBOX_AUTOCLOSE
SSAnne_2F_Room2_EventScript_Brooks:: @ 8160CC8
trainerbattle_single TRAINER_GENTLEMAN_BROOKS, SSAnne_2F_Room2_Text_BrooksIntro, SSAnne_2F_Room2_Text_BrooksDefeat
msgbox SSAnne_2F_Room2_Text_BrooksPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/SSAnne_2F_Room2/text.inc
+6 -6
View File
@@ -1,22 +1,22 @@
Text_173D63:: @ 8173D63
SSAnne_2F_Room2_Text_BrooksIntro:: @ 8173D63
.string "Competing against the young keeps\n"
.string "me youthful.$"
Text_173D92:: @ 8173D92
SSAnne_2F_Room2_Text_BrooksDefeat:: @ 8173D92
.string "Good match!\n"
.string "Ah, I feel young again!$"
gUnknown_8173DB6:: @ 8173DB6
SSAnne_2F_Room2_Text_BrooksPostBattle:: @ 8173DB6
.string "Fifteen years ago, I would\n"
.string "have won!$"
Text_173DDB:: @ 8173DDB
SSAnne_2F_Room2_Text_DaleIntro:: @ 8173DDB
.string "Check out what I fished up!$"
Text_173DF7:: @ 8173DF7
SSAnne_2F_Room2_Text_DaleDefeat:: @ 8173DF7
.string "I'm all out!$"
gUnknown_8173E04:: @ 8173E04
SSAnne_2F_Room2_Text_DalePostBattle:: @ 8173E04
.string "Party?\p"
.string "The cruise ship's party should be\n"
.string "over by now.$"
data/maps/SSAnne_2F_Room3/map.json
+2 -2
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_2F_Room3_EventScript_160CE0",
"script": "SSAnne_2F_Room3_EventScript_Gentleman",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_2F_Room3_EventScript_160CE9",
"script": "SSAnne_2F_Room3_EventScript_OldMan",
"flag": "0"
}
],
data/maps/SSAnne_2F_Room3/scripts.inc
+4 -4
View File
@@ -1,10 +1,10 @@
SSAnne_2F_Room3_MapScripts:: @ 8160CDF
.byte 0
SSAnne_2F_Room3_EventScript_160CE0:: @ 8160CE0
msgbox gUnknown_8173E3A, MSGBOX_NPC
SSAnne_2F_Room3_EventScript_Gentleman:: @ 8160CE0
msgbox SSAnne_2F_Room3_Text_SeenMonsFerryPeople, MSGBOX_NPC
end
SSAnne_2F_Room3_EventScript_160CE9:: @ 8160CE9
msgbox gUnknown_8173E7B, MSGBOX_NPC
SSAnne_2F_Room3_EventScript_OldMan:: @ 8160CE9
msgbox SSAnne_2F_Room3_Text_SomeTreesCanBeCutDown, MSGBOX_NPC
end
data/maps/SSAnne_2F_Room3/text.inc
+2 -2
View File
@@ -1,8 +1,8 @@
gUnknown_8173E3A:: @ 8173E3A
SSAnne_2F_Room3_Text_SeenMonsFerryPeople:: @ 8173E3A
.string "Ah, yes, I have seen some POKéMON\n"
.string "ferry people across the water!$"
gUnknown_8173E7B:: @ 8173E7B
SSAnne_2F_Room3_Text_SomeTreesCanBeCutDown:: @ 8173E7B
.string "Small trees can be chopped down\n"
.string "using the move CUT.\p"
.string "But remember this!\n"
data/maps/SSAnne_2F_Room4/map.json
+2 -2
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "SSAnne_2F_Room4_EventScript_160CF3",
"script": "SSAnne_2F_Room4_EventScript_Lamar",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "SSAnne_2F_Room4_EventScript_160D0A",
"script": "SSAnne_2F_Room4_EventScript_Dawn",
"flag": "0"
},
{
data/maps/SSAnne_2F_Room4/scripts.inc
+6 -6
View File
@@ -1,12 +1,12 @@
SSAnne_2F_Room4_MapScripts:: @ 8160CF2
.byte 0
SSAnne_2F_Room4_EventScript_160CF3:: @ 8160CF3
trainerbattle_single TRAINER_GENTLEMAN_LAMAR, Text_173F07, Text_173F42
msgbox gUnknown_8173F55, MSGBOX_AUTOCLOSE
SSAnne_2F_Room4_EventScript_Lamar:: @ 8160CF3
trainerbattle_single TRAINER_GENTLEMAN_LAMAR, SSAnne_2F_Room4_Text_LamarIntro, SSAnne_2F_Room4_Text_LamarDefeat
msgbox SSAnne_2F_Room4_Text_LamarPostBattle, MSGBOX_AUTOCLOSE
end
SSAnne_2F_Room4_EventScript_160D0A:: @ 8160D0A
trainerbattle_single TRAINER_LASS_DAWN, Text_173F83, Text_173FAB
msgbox gUnknown_8173FB9, MSGBOX_AUTOCLOSE
SSAnne_2F_Room4_EventScript_Dawn:: @ 8160D0A
trainerbattle_single TRAINER_LASS_DAWN, SSAnne_2F_Room4_Text_DawnIntro, SSAnne_2F_Room4_Text_DawnDefeat
msgbox SSAnne_2F_Room4_Text_DawnPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/SSAnne_2F_Room4/text.inc
+6 -6
View File
@@ -1,22 +1,22 @@
Text_173F07:: @ 8173F07
SSAnne_2F_Room4_Text_LamarIntro:: @ 8173F07
.string "Which do you find more worthy,\n"
.string "a strong or a rare POKéMON?$"
Text_173F42:: @ 8173F42
SSAnne_2F_Room4_Text_LamarDefeat:: @ 8173F42
.string "I must salute you!$"
gUnknown_8173F55:: @ 8173F55
SSAnne_2F_Room4_Text_LamarPostBattle:: @ 8173F55
.string "Personally, I prefer strong and\n"
.string "rare POKéMON.$"
Text_173F83:: @ 8173F83
SSAnne_2F_Room4_Text_DawnIntro:: @ 8173F83
.string "I don't believe I saw you at the\n"
.string "party?$"
Text_173FAB:: @ 8173FAB
SSAnne_2F_Room4_Text_DawnDefeat:: @ 8173FAB
.string "Take it easy!$"
gUnknown_8173FB9:: @ 8173FB9
SSAnne_2F_Room4_Text_DawnPostBattle:: @ 8173FB9
.string "Oh, I adore your strong POKéMON!\n"
.string "Oh, how I envy you for them!$"
data/maps/SSAnne_2F_Room5/map.json
+2 -2
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_2F_Room5_EventScript_160D22",
"script": "SSAnne_2F_Room5_EventScript_Gentleman",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_2F_Room5_EventScript_160D2B",
"script": "SSAnne_2F_Room5_EventScript_LittleBoy",
"flag": "0"
}
],
data/maps/SSAnne_2F_Room5/scripts.inc
+4 -4
View File
@@ -1,10 +1,10 @@
SSAnne_2F_Room5_MapScripts:: @ 8160D21
.byte 0
SSAnne_2F_Room5_EventScript_160D22:: @ 8160D22
msgbox gUnknown_8173FF7, MSGBOX_NPC
SSAnne_2F_Room5_EventScript_Gentleman:: @ 8160D22
msgbox SSAnne_2F_Room5_Text_HaveYouGoneToSafariZone, MSGBOX_NPC
end
SSAnne_2F_Room5_EventScript_160D2B:: @ 8160D2B
msgbox gUnknown_817404F, MSGBOX_NPC
SSAnne_2F_Room5_EventScript_LittleBoy:: @ 8160D2B
msgbox SSAnne_2F_Room5_Text_WeThinkSafariZoneIsAwesome, MSGBOX_NPC
end
data/maps/SSAnne_2F_Room5/text.inc
+2 -2
View File
@@ -1,10 +1,10 @@
gUnknown_8173FF7:: @ 8173FF7
SSAnne_2F_Room5_Text_HaveYouGoneToSafariZone:: @ 8173FF7
.string "Have you gone to the SAFARI ZONE\n"
.string "in FUCHSIA CITY?\p"
.string "There are many kinds of rare\n"
.string "POKéMON.$"
gUnknown_817404F:: @ 817404F
SSAnne_2F_Room5_Text_WeThinkSafariZoneIsAwesome:: @ 817404F
.string "Me and my daddy think the SAFARI\n"
.string "ZONE is awesome!\l"
.string "I wish we could go there again.$"
data/maps/SSAnne_2F_Room6/map.json
+2 -2
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_2F_Room6_EventScript_160D3E",
"script": "SSAnne_2F_Room6_EventScript_Woman2",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_2F_Room6_EventScript_160D35",
"script": "SSAnne_2F_Room6_EventScript_Woman1",
"flag": "0"
}
],
data/maps/SSAnne_2F_Room6/scripts.inc
+4 -4
View File
@@ -1,10 +1,10 @@
SSAnne_2F_Room6_MapScripts:: @ 8160D34
.byte 0
SSAnne_2F_Room6_EventScript_160D35:: @ 8160D35
msgbox gUnknown_81740A1, MSGBOX_NPC
SSAnne_2F_Room6_EventScript_Woman1:: @ 8160D35
msgbox SSAnne_2F_Room6_Text_CaptainIsAwfullySick, MSGBOX_NPC
end
SSAnne_2F_Room6_EventScript_160D3E:: @ 8160D3E
msgbox gUnknown_81740D6, MSGBOX_NPC
SSAnne_2F_Room6_EventScript_Woman2:: @ 8160D3E
msgbox SSAnne_2F_Room6_Text_ManyPeopleGetSeasick, MSGBOX_NPC
end
data/maps/SSAnne_2F_Room6/text.inc
+2 -2
View File
@@ -1,7 +1,7 @@
gUnknown_81740A1:: @ 81740A1
SSAnne_2F_Room6_Text_CaptainIsAwfullySick:: @ 81740A1
.string "The CAPTAIN said he's awfully sick.\n"
.string "He was all pale.$"
gUnknown_81740D6:: @ 81740D6
SSAnne_2F_Room6_Text_ManyPeopleGetSeasick:: @ 81740D6
.string "I hear many people get seasick.$"
data/maps/SSAnne_3F_Corridor/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_3F_Corridor_EventScript_160A5E",
"script": "SSAnne_3F_Corridor_EventScript_Sailor",
"flag": "0"
}
],
data/maps/SSAnne_3F_Corridor/scripts.inc
+2 -2
View File
@@ -1,6 +1,6 @@
SSAnne_3F_Corridor_MapScripts:: @ 8160A5D
.byte 0
SSAnne_3F_Corridor_EventScript_160A5E:: @ 8160A5E
msgbox gUnknown_817320C, MSGBOX_NPC
SSAnne_3F_Corridor_EventScript_Sailor:: @ 8160A5E
msgbox SSAnne_3F_Corridor_Text_CaptainTeachesCutToMons, MSGBOX_NPC
end
data/maps/SSAnne_3F_Corridor/text.inc
+1 -1
View File
@@ -1,4 +1,4 @@
gUnknown_817320C:: @ 817320C
SSAnne_3F_Corridor_Text_CaptainTeachesCutToMons:: @ 817320C
.string "Our CAPTAIN is a sword master.\n"
.string "He's awesome at using CUT.\p"
.string "They say he even teaches CUT\n"
data/maps/SSAnne_B1F_Room1/map.json
+2 -2
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
"script": "SSAnne_B1F_Room1_EventScript_160D48",
"script": "SSAnne_B1F_Room1_EventScript_Barny",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
"script": "SSAnne_B1F_Room1_EventScript_160D5F",
"script": "SSAnne_B1F_Room1_EventScript_Phillip",
"flag": "0"
}
],
data/maps/SSAnne_B1F_Room1/scripts.inc
+6 -6
View File
@@ -1,12 +1,12 @@
SSAnne_B1F_Room1_MapScripts:: @ 8160D47
.byte 0
SSAnne_B1F_Room1_EventScript_160D48:: @ 8160D48
trainerbattle_single TRAINER_FISHERMAN_BARNY, Text_174177, Text_1741EF
msgbox gUnknown_817420E, MSGBOX_AUTOCLOSE
SSAnne_B1F_Room1_EventScript_Barny:: @ 8160D48
trainerbattle_single TRAINER_FISHERMAN_BARNY, SSAnne_B1F_Room1_Text_BarnyIntro, SSAnne_B1F_Room1_Text_BarnyDefeat
msgbox SSAnne_B1F_Room1_Text_BarnyPostBattle, MSGBOX_AUTOCLOSE
end
SSAnne_B1F_Room1_EventScript_160D5F:: @ 8160D5F
trainerbattle_single TRAINER_SAILOR_PHILLIP, Text_1740F6, Text_174123
msgbox gUnknown_817413A, MSGBOX_AUTOCLOSE
SSAnne_B1F_Room1_EventScript_Phillip:: @ 8160D5F
trainerbattle_single TRAINER_SAILOR_PHILLIP, SSAnne_B1F_Room1_Text_PhillipIntro, SSAnne_B1F_Room1_Text_PhillipDefeat
msgbox SSAnne_B1F_Room1_Text_PhillipPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/SSAnne_B1F_Room1/text.inc
+6 -6
View File
@@ -1,26 +1,26 @@
Text_1740F6:: @ 81740F6
SSAnne_B1F_Room1_Text_PhillipIntro:: @ 81740F6
.string "Matey, you're walking the plank if\n"
.string "you lose!$"
Text_174123:: @ 8174123
SSAnne_B1F_Room1_Text_PhillipDefeat:: @ 8174123
.string "Argh!\n"
.string "Beaten by a kid!$"
gUnknown_817413A:: @ 817413A
SSAnne_B1F_Room1_Text_PhillipPostBattle:: @ 817413A
.string "When we're out at sea, jellyfish\n"
.string "POKéMON sometimes drift by.$"
Text_174177:: @ 8174177
SSAnne_B1F_Room1_Text_BarnyIntro:: @ 8174177
.string "Hello, stranger!\p"
.string "I can't tell if you're from the seas\n"
.string "or mountains, but stop and chat.\p"
.string "All my POKéMON are from the sea.$"
Text_1741EF:: @ 81741EF
SSAnne_B1F_Room1_Text_BarnyDefeat:: @ 81741EF
.string "Darn!\n"
.string "I let that one get away!$"
gUnknown_817420E:: @ 817420E
SSAnne_B1F_Room1_Text_BarnyPostBattle:: @ 817420E
.string "I was going to make you my\n"
.string "assistant, too!$"
data/maps/SSAnne_B1F_Room2/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
"script": "SSAnne_B1F_Room2_EventScript_160D77",
"script": "SSAnne_B1F_Room2_EventScript_Huey",
"flag": "0"
},
{
data/maps/SSAnne_B1F_Room2/scripts.inc
+3 -3
View File
@@ -1,7 +1,7 @@
SSAnne_B1F_Room2_MapScripts:: @ 8160D76
.byte 0
SSAnne_B1F_Room2_EventScript_160D77:: @ 8160D77
trainerbattle_single TRAINER_SAILOR_HUEY, Text_174239, Text_17425C
msgbox gUnknown_8174272, MSGBOX_AUTOCLOSE
SSAnne_B1F_Room2_EventScript_Huey:: @ 8160D77
trainerbattle_single TRAINER_SAILOR_HUEY, SSAnne_B1F_Room2_Text_HueyIntro, SSAnne_B1F_Room2_Text_HueyDefeat
msgbox SSAnne_B1F_Room2_Text_HueyPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/SSAnne_B1F_Room2/text.inc
+3 -3
View File
@@ -1,10 +1,10 @@
Text_174239:: @ 8174239
SSAnne_B1F_Room2_Text_HueyIntro:: @ 8174239
.string "Even us sailors have POKéMON, too!$"
Text_17425C:: @ 817425C
SSAnne_B1F_Room2_Text_HueyDefeat:: @ 817425C
.string "Okay, you're not bad.$"
gUnknown_8174272:: @ 8174272
SSAnne_B1F_Room2_Text_HueyPostBattle:: @ 8174272
.string "We caught all our POKéMON while\n"
.string "we were out at sea.$"
data/maps/SSAnne_B1F_Room3/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "SSAnne_B1F_Room3_EventScript_160D8F",
"script": "SSAnne_B1F_Room3_EventScript_Dylan",
"flag": "0"
},
{
data/maps/SSAnne_B1F_Room3/scripts.inc
+3 -3
View File
@@ -1,7 +1,7 @@
SSAnne_B1F_Room3_MapScripts:: @ 8160D8E
.byte 0
SSAnne_B1F_Room3_EventScript_160D8F:: @ 8160D8F
trainerbattle_single TRAINER_SAILOR_DYLAN, Text_1742A6, Text_1742C3
msgbox gUnknown_81742D2, MSGBOX_AUTOCLOSE
SSAnne_B1F_Room3_EventScript_Dylan:: @ 8160D8F
trainerbattle_single TRAINER_SAILOR_DYLAN, SSAnne_B1F_Room3_Text_DylanIntro, SSAnne_B1F_Room3_Text_DylanDefeat
msgbox SSAnne_B1F_Room3_Text_DylanPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/SSAnne_B1F_Room3/text.inc
+3 -3
View File
@@ -1,11 +1,11 @@
Text_1742A6:: @ 81742A6
SSAnne_B1F_Room3_Text_DylanIntro:: @ 81742A6
.string "I like feisty kids like you!$"
Text_1742C3:: @ 81742C3
SSAnne_B1F_Room3_Text_DylanDefeat:: @ 81742C3
.string "Argh!\n"
.string "Lost it!$"
gUnknown_81742D2:: @ 81742D2
SSAnne_B1F_Room3_Text_DylanPostBattle:: @ 81742D2
.string "Sea POKéMON live in deep water.\n"
.string "You'll need a ROD to fish them up!$"
data/maps/SSAnne_B1F_Room4/map.json
+2 -2
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "SSAnne_B1F_Room4_EventScript_160DBE",
"script": "SSAnne_B1F_Room4_EventScript_Duncan",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
"script": "SSAnne_B1F_Room4_EventScript_160DA7",
"script": "SSAnne_B1F_Room4_EventScript_Leonard",
"flag": "0"
}
],
data/maps/SSAnne_B1F_Room4/scripts.inc
+6 -6
View File
@@ -1,12 +1,12 @@
SSAnne_B1F_Room4_MapScripts:: @ 8160DA6
.byte 0
SSAnne_B1F_Room4_EventScript_160DA7:: @ 8160DA7
trainerbattle_single TRAINER_SAILOR_LEONARD, Text_174315, Text_174348
msgbox gUnknown_8174362, MSGBOX_AUTOCLOSE
SSAnne_B1F_Room4_EventScript_Leonard:: @ 8160DA7
trainerbattle_single TRAINER_SAILOR_LEONARD, SSAnne_B1F_Room4_Text_LeonardIntro, SSAnne_B1F_Room4_Text_LeonardDefeat
msgbox SSAnne_B1F_Room4_Text_LeonardPostBattle, MSGBOX_AUTOCLOSE
end
SSAnne_B1F_Room4_EventScript_160DBE:: @ 8160DBE
trainerbattle_single TRAINER_SAILOR_DUNCAN, Text_174385, Text_1743B3
msgbox gUnknown_81743C8, MSGBOX_AUTOCLOSE
SSAnne_B1F_Room4_EventScript_Duncan:: @ 8160DBE
trainerbattle_single TRAINER_SAILOR_DUNCAN, SSAnne_B1F_Room4_Text_DuncanIntro, SSAnne_B1F_Room4_Text_DuncanDefeat
msgbox SSAnne_B1F_Room4_Text_DuncanPostBattle, MSGBOX_AUTOCLOSE
end

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