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

Sync split scripts, more misc splits/doc

Browse Source
This commit is contained in:
GriffinR
2020-01-10 05:01:48 -05:00
parent 9fafa12285
commit 91bf7665c6
96 changed files with 955 additions and 943 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_control_avatar.s
+4 -4
View File
@@ -1620,10 +1620,10 @@ sub_806D548: @ 806D548
lsrs r0, 24
cmp r0, 0x1
bne _0806D570
ldr r0, _0806D56C @ =gUnknown_81A6B0D
ldr r0, _0806D56C @ =EventScript_CurrentTooFast
b _0806D5E2
.align 2, 0
_0806D56C: .4byte gUnknown_81A6B0D
_0806D56C: .4byte EventScript_CurrentTooFast
_0806D570:
ldr r0, _0806D59C @ =0x00000824
bl FlagGet
@@ -1664,11 +1664,11 @@ _0806D5A4:
lsrs r0, 24
cmp r0, 0x1
bne _0806D5D8
ldr r0, _0806D5D4 @ =gUnknown_81BE2B7
ldr r0, _0806D5D4 @ =EventScript_InteractWithWaterfall
b _0806D5E2
.align 2, 0
_0806D5D0: .4byte 0x00000826
_0806D5D4: .4byte gUnknown_81BE2B7
_0806D5D4: .4byte EventScript_InteractWithWaterfall
_0806D5D8:
ldr r0, _0806D5DC @ =EventScript_81BE2FF
b _0806D5E2
asm/fldeff_cut.s
+2 -2
View File
@@ -189,13 +189,13 @@ sub_80979D0: @ 80979D0
lsls r0, 24
lsrs r0, 24
str r0, [r1]
ldr r0, _080979EC @ =gUnknown_81BDF6B
ldr r0, _080979EC @ =EventScript_FldEffCut
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
_080979E8: .4byte gFieldEffectArguments
_080979EC: .4byte gUnknown_81BDF6B
_080979EC: .4byte EventScript_FldEffCut
thumb_func_end sub_80979D0
thumb_func_start sub_80979F0
asm/fldeff_flash.s
+2 -2
View File
@@ -76,13 +76,13 @@ sub_80C9BB0: @ 80C9BB0
bl PlaySE
ldr r0, _080C9BC8 @ =0x00000806
bl FlagSet
ldr r0, _080C9BCC @ =EventScript_81BFB5F
ldr r0, _080C9BCC @ =EventScript_FldEffFlash
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
_080C9BC8: .4byte 0x00000806
_080C9BCC: .4byte EventScript_81BFB5F
_080C9BCC: .4byte EventScript_FldEffFlash
thumb_func_end sub_80C9BB0
thumb_func_start sub_80C9BD0
data/event_scripts.s
+22 -225
View File
@@ -825,14 +825,16 @@ Text_1A5160:: @ 81A5160
.string "Welcome to the POKéMON CABLE CLUB\n"
.string "TIME CAPSULE.$"
gUnknown_81A5190:: @ 81A5190
Text_PleaseComeAgain:: @ 81A5190
.string "Please come again!$"
Text_1A51A3:: @ 81A51A3
@ Unused
Text_HavingDiscountSaleToday:: @ 81A51A3
.string "Welcome!\p"
.string "We're having a discount sale today!$"
Text_1A51D0:: @ 81A51D0
@ Unused
Text_PlayerWhatCanIDoForYou:: @ 81A51D0
.string "{PLAYER}{KUN}, welcome!\p"
.string "What can I do for you?$"
@@ -841,10 +843,10 @@ Text_1A51D0:: @ 81A51D0
Text_1A5351:: @ 81A5351
.string "じゅんびちゅうです！$"
Text_1A535C:: @ 81A535C
Text_WantWhichFloor:: @ 81A535C
.string "Which floor do you want?$"
Text_1A5375:: @ 81A5375
Text_BagItemCanBeRegistered:: @ 81A5375
.string "An item in the BAG can be\n"
.string "registered to SELECT for easy use.$"
@@ -1091,7 +1093,7 @@ Text_1A61E5:: @ 81A61E5
.include "data/text/poke_mart.inc"
Text_1A63C4:: @ 81A63C4
Text_MonFlewAway:: @ 81A63C4
.string "The {STR_VAR_1} flew away!$"
Text_1A63D6:: @ 81A63D6
@@ -1113,7 +1115,7 @@ Text_1A641B:: @ 81A641B
Text_1A6448:: @ 81A6448
.string "Gyaoo!$"
Text_1A644F:: @ 81A644F
Text_MoveCanOnlyBeLearnedOnce:: @ 81A644F
.string "This move can be learned only\n"
.string "once. Is that okay?$"
@@ -1172,29 +1174,29 @@ EventScript_ResetAllMapFlags:: @ 81A6481
EventScript_1A651A:: @ 81A651A
clearflag FLAG_HIDE_POSTGAME_GOSSIPERS
call EventScript_1A6551
call EventScript_ResetEliteFour
special sub_81130A8
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
call_if_eq EventScript_1A653B
call EventScript_1A6541
call EventScript_ResetLegendaries
return
EventScript_1A653B:: @ 81A653B
setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 2
return
EventScript_1A6541:: @ 81A6541
EventScript_ResetLegendaries:: @ 81A6541
clearflag FLAG_LUGIA_FLEW_AWAY
clearflag FLAG_HO_OH_FLEW_AWAY
clearflag FLAG_DEOXYS_FLEW_AWAY
return
gUnknown_81A654B:: @ 81A654B
call EventScript_1A6551
call EventScript_ResetEliteFour
end
EventScript_1A6551:: @ 81A6551
EventScript_ResetEliteFour:: @ 81A6551
clearflag FLAG_DEFEATED_LORELEI
clearflag FLAG_DEFEATED_BRUNO
clearflag FLAG_DEFEATED_AGATHA
@@ -1213,6 +1215,7 @@ EventScript_1A6551:: @ 81A6551
.include "data/scripts/obtain_item.inc"
.include "data/scripts/pc.inc"
@ DoEasyChatScreen?
EventScript_1A6AC0:: @ 81A6AC0
fadescreen FADE_TO_BLACK
special sub_80FEE44
@@ -1527,12 +1530,12 @@ EventScript_1A774D:: @ 81A774D
waitmovement 0
applymovement VAR_0x8008, Movement_Delay48
waitmovement 0
msgbox Text_1A62D3
msgbox Text_YouKnowThoseWords
setflag FLAG_SYS_MYSTERY_GIFT_ENABLED
textcolor 3
special sub_80699BC
signmsg
msgbox Text_1A6359
msgbox Text_YouCanAccessMysteryGift
normalmsg
releaseall
end
@@ -1544,12 +1547,12 @@ EventScript_1A778A:: @ 81A778A
EventScript_1A778C:: @ 81A778C
applymovement VAR_0x8008, Movement_FaceDown
waitmovement 0
msgbox Text_1A6265
msgbox Text_QuestionnaireThankYou
releaseall
end
gUnknown_81A77A0:: @ 81A77A0
msgbox Text_1A5375, MSGBOX_SIGN
msgbox Text_BagItemCanBeRegistered, MSGBOX_SIGN
end
EventScript_1A77A9:: @ 81A77A9
@@ -1608,213 +1611,7 @@ EventScript_1A7AE0:: @ 81A7AE0
release
end
EventScript_1A7AE2:: @ 81A7AE2
msgbox Text_177460, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1A7B70
msgbox Text_17747B
goto_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7B3B
setflag FLAG_POKEMON_MANSION_SWITCH_STATE
switch VAR_0x8004
case 0, EventScript_1A7B7A
case 1, EventScript_1A7D3E
case 2, EventScript_1A7E72
case 3, EventScript_1A7F4C
end
EventScript_1A7B3B:: @ 81A7B3B
clearflag FLAG_POKEMON_MANSION_SWITCH_STATE
switch VAR_0x8004
case 0, EventScript_1A7C5C
case 1, EventScript_1A7DD8
case 2, EventScript_1A7EDF
case 3, EventScript_1A8025
end
EventScript_1A7B70:: @ 81A7B70
msgbox Text_177489
releaseall
end
EventScript_1A7B7A:: @ 81A7B7A
setmetatile 22, 10, 645, 0
setmetatile 23, 10, 644, 0
setmetatile 24, 10, 644, 0
setmetatile 22, 11, 645, 0
setmetatile 23, 11, 644, 0
setmetatile 24, 11, 644, 0
setmetatile 27, 25, 645, 0
setmetatile 28, 25, 644, 0
setmetatile 29, 25, 644, 0
setmetatile 27, 26, 645, 0
setmetatile 28, 26, 644, 0
setmetatile 29, 26, 644, 0
setmetatile 32, 25, 645, 0
setmetatile 33, 25, 644, 0
setmetatile 34, 25, 644, 0
setmetatile 32, 26, 645, 0
setmetatile 33, 26, 644, 0
setmetatile 34, 26, 644, 0
setmetatile 31, 18, 760, 1
setmetatile 32, 18, 761, 1
setmetatile 33, 18, 762, 1
setmetatile 31, 19, 768, 1
setmetatile 32, 19, 769, 1
setmetatile 33, 19, 770, 1
setmetatile 5, 4, 845, 0
return
EventScript_1A7C5C:: @ 81A7C5C
setmetatile 22, 10, 760, 1
setmetatile 23, 10, 761, 1
setmetatile 24, 10, 762, 1
setmetatile 22, 11, 768, 1
setmetatile 23, 11, 769, 1
setmetatile 24, 11, 770, 1
setmetatile 27, 25, 760, 1
setmetatile 28, 25, 761, 1
setmetatile 29, 25, 762, 1
setmetatile 27, 26, 768, 1
setmetatile 28, 26, 769, 1
setmetatile 29, 26, 770, 1
setmetatile 32, 25, 760, 1
setmetatile 33, 25, 761, 1
setmetatile 34, 25, 762, 1
setmetatile 32, 26, 768, 1
setmetatile 33, 26, 769, 1
setmetatile 34, 26, 770, 1
setmetatile 31, 18, 645, 0
setmetatile 32, 18, 644, 0
setmetatile 33, 18, 644, 0
setmetatile 31, 19, 645, 0
setmetatile 32, 19, 644, 0
setmetatile 33, 19, 644, 0
setmetatile 5, 4, 788, 0
return
EventScript_1A7D3E:: @ 81A7D3E
setmetatile 24, 14, 645, 0
setmetatile 25, 14, 644, 0
setmetatile 26, 14, 644, 0
setmetatile 24, 15, 645, 0
setmetatile 25, 15, 644, 0
setmetatile 26, 15, 644, 0
setmetatile 10, 28, 677, 1
setmetatile 10, 29, 685, 1
setmetatile 10, 30, 645, 0
setmetatile 10, 31, 644, 0
setmetatile 10, 32, 693, 0
setmetatile 12, 4, 848, 1
setmetatile 12, 5, 856, 1
setmetatile 12, 6, 864, 1
setmetatile 12, 7, 872, 1
setmetatile 12, 8, 880, 1
setmetatile 2, 15, 845, 0
return
EventScript_1A7DD8:: @ 81A7DD8
setmetatile 24, 14, 760, 1
setmetatile 25, 14, 761, 1
setmetatile 26, 14, 762, 1
setmetatile 24, 15, 768, 1
setmetatile 25, 15, 769, 1
setmetatile 26, 15, 770, 1
setmetatile 10, 28, 848, 1
setmetatile 10, 29, 856, 1
setmetatile 10, 30, 864, 1
setmetatile 10, 31, 872, 1
setmetatile 10, 32, 880, 1
setmetatile 12, 4, 677, 1
setmetatile 12, 5, 685, 1
setmetatile 12, 6, 645, 0
setmetatile 12, 7, 644, 0
setmetatile 12, 8, 693, 0
setmetatile 2, 15, 788, 0
return
EventScript_1A7E72:: @ 81A7E72
setmetatile 17, 11, 645, 0
setmetatile 18, 11, 644, 0
setmetatile 19, 11, 644, 0
setmetatile 17, 12, 645, 0
setmetatile 18, 12, 644, 0
setmetatile 19, 12, 644, 0
setmetatile 21, 4, 848, 1
setmetatile 21, 5, 856, 1
setmetatile 21, 6, 864, 1
setmetatile 21, 7, 872, 1
setmetatile 21, 8, 880, 1
setmetatile 12, 4, 845, 0
return
EventScript_1A7EDF:: @ 81A7EDF
setmetatile 17, 11, 760, 1
setmetatile 18, 11, 761, 1
setmetatile 19, 11, 762, 1
setmetatile 17, 12, 768, 1
setmetatile 18, 12, 769, 1
setmetatile 19, 12, 770, 1
setmetatile 21, 4, 677, 1
setmetatile 21, 5, 685, 1
setmetatile 21, 6, 645, 0
setmetatile 21, 7, 644, 0
setmetatile 21, 8, 693, 0
setmetatile 12, 4, 788, 0
return
EventScript_1A7F4C:: @ 81A7F4C
setmetatile 33, 20, 760, 1
setmetatile 34, 20, 761, 1
setmetatile 35, 20, 762, 1
setmetatile 33, 21, 852, 1
setmetatile 34, 21, 853, 1
setmetatile 35, 21, 854, 1
setmetatile 16, 26, 848, 1
setmetatile 16, 27, 856, 1
setmetatile 16, 28, 866, 1
setmetatile 16, 29, 874, 1
setmetatile 16, 30, 882, 1
setmetatile 12, 8, 677, 1
setmetatile 12, 9, 685, 1
setmetatile 12, 10, 647, 0
setmetatile 12, 11, 646, 0
setmetatile 12, 12, 688, 0
setmetatile 20, 22, 647, 0
setmetatile 21, 22, 646, 0
setmetatile 22, 22, 646, 0
setmetatile 20, 23, 647, 0
setmetatile 21, 23, 646, 0
setmetatile 22, 23, 646, 0
setmetatile 24, 28, 847, 0
setmetatile 27, 4, 847, 0
return
EventScript_1A8025:: @ 81A8025
setmetatile 33, 20, 647, 0
setmetatile 34, 20, 646, 0
setmetatile 35, 20, 646, 0
setmetatile 33, 21, 647, 0
setmetatile 34, 21, 646, 0
setmetatile 35, 21, 646, 0
setmetatile 16, 26, 677, 1
setmetatile 16, 27, 685, 1
setmetatile 16, 28, 647, 0
setmetatile 16, 29, 646, 0
setmetatile 16, 30, 688, 0
setmetatile 12, 8, 848, 1
setmetatile 12, 9, 856, 1
setmetatile 12, 10, 866, 1
setmetatile 12, 11, 874, 1
setmetatile 12, 12, 882, 1
setmetatile 20, 22, 760, 1
setmetatile 21, 22, 761, 1
setmetatile 22, 22, 762, 1
setmetatile 20, 23, 852, 1
setmetatile 21, 23, 853, 1
setmetatile 22, 23, 854, 1
setmetatile 24, 28, 790, 0
setmetatile 27, 4, 790, 0
return
.include "data/scripts/pokemon_mansion.inc"
EventScript_1A80FE:: @ 81A80FE
lockall
@@ -2041,7 +1838,7 @@ EventScript_AfterWhiteOutHeal:: @ 81A8D97
call EventScript_PkmnCenterNurse_TakeAndHealPkmn
call_if_unset FLAG_DEFEATED_BROCK, EventScript_1A8DC6
call_if_set FLAG_DEFEATED_BROCK, EventScript_1A8DCF
applymovement VAR_LAST_TALKED, Movement_1A666C
applymovement VAR_LAST_TALKED, Movement_Bow
waitmovement 0
fadedefaultbgm
releaseall
data/maps/BirthIsland_Exterior/scripts.inc
+2 -2
View File
@@ -105,12 +105,12 @@ EventScript_1652C0:: @ 81652C0
EventScript_16533A:: @ 816533A
setflag FLAG_DEOXYS_FLEW_AWAY
setvar VAR_0x8004, SPECIES_DEOXYS
goto EventScript_1A9236
goto EventScript_MonFlewAway
end
EventScript_165348:: @ 8165348
setvar VAR_0x8004, SPECIES_DEOXYS
goto EventScript_1A9236
goto EventScript_MonFlewAway
end
Movement_165353:: @ 8165353
data/maps/CeladonCity/map.json
+1 -1
View File
@@ -112,7 +112,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_EventScript_166CBF",
"script": "CeladonCity_EventScript_SoftboiledTutor",
"flag": "0"
},
{
data/maps/CeladonCity/scripts.inc
+2 -2
View File
@@ -24,8 +24,8 @@ CeladonCity_EventScript_166CB6:: @ 8166CB6
msgbox gUnknown_817FFC5, MSGBOX_NPC
end
CeladonCity_EventScript_166CBF:: @ 8166CBF
goto EventScript_1C4A86
CeladonCity_EventScript_SoftboiledTutor:: @ 8166CBF
goto EventScript_SoftboiledTutor
end
CeladonCity_EventScript_166CC5:: @ 8166CC5
data/maps/CeladonCity/text.inc
+4 -4
View File
@@ -83,7 +83,7 @@ gUnknown_8180300:: @ 8180300
.string "But it was boiling hot!\n"
.string "Gotta cool it to drink it.$"
Text_180388:: @ 8180388
Text_SoftboiledTeach:: @ 8180388
.string "Hello, there!\p"
.string "I've seen you about, but I never\n"
.string "had a chance to chat.\p"
@@ -92,16 +92,16 @@ Text_180388:: @ 8180388
.string "I'd like to celebrate by teaching\n"
.string "you the move SOFTBOILED.$"
Text_18043F:: @ 818043F
Text_SoftboiledDeclined:: @ 818043F
.string "I'll always be keeping an eye out\n"
.string "for you.\p"
.string "I hope we can chat again.$"
Text_180484:: @ 8180484
Text_SoftboiledWhichMon:: @ 8180484
.string "So, who's the POKéMON that gets\n"
.string "the chance to learn SOFTBOILED?$"
Text_1804C4:: @ 81804C4
Text_SoftboiledTaught:: @ 81804C4
.string "I wish you the best of luck!$"
gUnknown_81804E1:: @ 81804E1
data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
+2 -2
View File
@@ -22,7 +22,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10
message Text_MayIHelpYou
waitmessage
pokemart Items_16BB38
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
@@ -50,7 +50,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E
message Text_MayIHelpYou
waitmessage
pokemart Items_16BB74
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
data/maps/CeladonCity_DepartmentStore_3F/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": "CeladonCity_DepartmentStore_3F_EventScript_16BB85",
"script": "CeladonCity_DepartmentStore_3F_EventScript_CounterTutor",
"flag": "0"
},
{
data/maps/CeladonCity_DepartmentStore_3F/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
CeladonCity_DepartmentStore_3F_MapScripts:: @ 816BB84
.byte 0
CeladonCity_DepartmentStore_3F_EventScript_16BB85:: @ 816BB85
goto EventScript_1C4C26
CeladonCity_DepartmentStore_3F_EventScript_CounterTutor:: @ 816BB85
goto EventScript_CounterTutor
end
CeladonCity_DepartmentStore_3F_EventScript_16BB8B:: @ 816BB8B
data/maps/CeladonCity_DepartmentStore_4F/scripts.inc
+1 -1
View File
@@ -22,7 +22,7 @@ CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A
message Text_MayIHelpYou
waitmessage
pokemart Items_16BC30
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
data/maps/CeladonCity_DepartmentStore_4F/text.inc
+4 -4
View File
@@ -1,4 +1,4 @@
Text_195928:: @ 8195928
Text_CounterTeach:: @ 8195928
.string "Oh, hi!\n"
.string "I finally finished POKéMON.\p"
.string "Not done yet? How about I teach\n"
@@ -8,15 +8,15 @@ Text_195928:: @ 8195928
.string "Not like the one I'm leaning on,\n"
.string "mind you!$"
Text_1959CC:: @ 81959CC
Text_CounterDeclined:: @ 81959CC
.string "You're not interested? Come see\n"
.string "me if you change your mind.$"
Text_195A08:: @ 8195A08
Text_CounterWhichMon:: @ 8195A08
.string "Which POKéMON should I teach\n"
.string "COUNTER to?$"
Text_195A31:: @ 8195A31
Text_CounterTaught:: @ 8195A31
.string "Are you using that COUNTER move\n"
.string "I taught your POKéMON?$"
data/maps/CeladonCity_DepartmentStore_5F/scripts.inc
+2 -2
View File
@@ -22,7 +22,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C
message Text_MayIHelpYou
waitmessage
pokemart Items_16BC84
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
@@ -48,7 +48,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96
message Text_MayIHelpYou
waitmessage
pokemart Items_16BCBC
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
+1 -1
View File
@@ -7,7 +7,7 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153
call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special Special_DrawElevatorCurrentFloorWindow
message Text_1A535C
message Text_WantWhichFloor
waitmessage
setvar VAR_0x8004, 3
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
data/maps/CeruleanCave_B1F/scripts.inc
+2 -2
View File
@@ -55,14 +55,14 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
EventScript_162558:: @ 8162558
setflag FLAG_FOUGHT_MEWTWO
goto EventScript_1A922D
goto EventScript_RemoveStaticMon
EventScript_162560:: @ 8162560
end
EventScript_162561:: @ 8162561
setvar VAR_0x8004, SPECIES_MEWTWO
goto EventScript_1A9236
goto EventScript_MonFlewAway
EventScript_16256B:: @ 816256B
end
data/maps/CeruleanCity_Mart/scripts.inc
+1 -1
View File
@@ -18,7 +18,7 @@ CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0
message Text_MayIHelpYou
waitmessage
pokemart Items_16ACD8
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
data/maps/CinnabarIsland_Mart/scripts.inc
+1 -1
View File
@@ -18,7 +18,7 @@ CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22
message Text_MayIHelpYou
waitmessage
pokemart Items_16EA48
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc
+4 -4
View File
@@ -1,4 +1,4 @@
Text_19A137:: @ 819A137
Text_MetronomeTeach:: @ 819A137
.string "Tch-tch-tch!\n"
.string "I'll teach you a nifty move.\p"
.string "Teach it to a POKéMON, and watch\n"
@@ -6,14 +6,14 @@ Text_19A137:: @ 819A137
.string "It's a move called METRONOME.\n"
.string "Does it strike your fancy?$"
Text_19A1CB:: @ 819A1CB
Text_MetronomeDeclined:: @ 819A1CB
.string "I tell you, it's a lot of fun!$"
Text_19A1EA:: @ 819A1EA
Text_MetronomeWhichMon:: @ 819A1EA
.string "Okay!\n"
.string "Which POKéMON should I teach?$"
Text_19A20E:: @ 819A20E
Text_MetronomeTaught:: @ 819A20E
.string "Tch-tch-tch!\n"
.string "That's the sound of a METRONOME.\p"
.string "It tweaks your POKéMON's brain into\n"
data/maps/CinnabarIsland_PokemonLab_ResearchRoom/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": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF",
"script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_MetronomeTutor",
"flag": "0"
},
{
data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
CinnabarIsland_PokemonLab_ResearchRoom_MapScripts:: @ 816E3DE
.byte 0
CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF:: @ 816E3DF
goto EventScript_1C4C8E
CinnabarIsland_PokemonLab_ResearchRoom_EventScript_MetronomeTutor:: @ 816E3DF
goto EventScript_MetronomeTutor
end
CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5:: @ 816E3E5
data/maps/FourIsland_House1/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": "FourIsland_House1_EventScript_1C4D84",
"script": "FourIsland_House1_EventScript_BodySlamTutor",
"flag": "0"
},
{
data/maps/FourIsland_Mart/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ FourIsland_Mart_EventScript_171CAE:: @ 8171CAE
message Text_MayIHelpYou
waitmessage
pokemart Items_171CD4
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
data/maps/FourIsland_PokemonCenter_1F/text.inc
+4 -4
View File
@@ -1,4 +1,4 @@
Text_1A3505:: @ 81A3505
Text_BodySlamTeach:: @ 81A3505
.string "Ready?\n"
.string "Boing!\p"
.string "We're having a BODY SLAM match\n"
@@ -8,15 +8,15 @@ Text_1A3505:: @ 81A3505
.string "How about I teach BODY SLAM to\n"
.string "a POKéMON of yours instead?$"
Text_1A35C7:: @ 81A35C7
Text_BodySlamDeclined:: @ 81A35C7
.string "Come again!\n"
.string "Boing!$"
Text_1A35DA:: @ 81A35DA
Text_BodySlamWhichMon:: @ 81A35DA
.string "Which POKéMON wants to learn how\n"
.string "to BODY SLAM?$"
Text_1A3609:: @ 81A3609
Text_BodySlamTaught:: @ 81A3609
.string "Boioing!$"
Text_1A3612:: @ 81A3612
data/maps/FuchsiaCity/map.json
+1 -1
View File
@@ -221,7 +221,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_EventScript_1C4AEE",
"script": "FuchsiaCity_EventScript_SubstituteTutor",
"flag": "0"
},
{
data/maps/FuchsiaCity/text.inc
+4 -4
View File
@@ -79,7 +79,7 @@ gUnknown_81808FA:: @ 81808FA
Text_180945:: @ 8180945
.string "……$"
Text_180948:: @ 8180948
Text_SubstituteTeach:: @ 8180948
.string "Aww, I wish I was a KANGASKHAN\n"
.string "baby.\p"
.string "I'd love to be a substitute for the\n"
@@ -91,15 +91,15 @@ Text_180948:: @ 8180948
.string "Want me to teach SUBSTITUTE to\n"
.string "one of your POKéMON?$"
Text_180A32:: @ 8180A32
Text_SubstituteDeclined:: @ 8180A32
.string "Oh, really?\n"
.string "SUBSTITUTE seems so fun…$"
Text_180A57:: @ 8180A57
Text_SubstituteWhichMon:: @ 8180A57
.string "Which POKéMON wants to learn\n"
.string "SUBSTITUTE?$"
Text_180A80:: @ 8180A80
Text_SubstituteTaught:: @ 8180A80
.string "Boy, what I'd give to crawl inside\n"
.string "a KANGASKHAN belly pouch…$"
data/maps/FuchsiaCity_Mart/scripts.inc
+1 -1
View File
@@ -18,7 +18,7 @@ FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3
message Text_MayIHelpYou
waitmessage
pokemart Items_16D518
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -49,7 +49,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC
message Text_MayIHelpYou
waitmessage
pokemart Items_16EAF4
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
data/maps/LavenderTown_Mart/scripts.inc
+1 -1
View File
@@ -22,7 +22,7 @@ LavenderTown_Mart_EventScript_16B36B:: @ 816B36B
message Text_MayIHelpYou
waitmessage
pokemart Items_16B390
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
data/maps/MtEmber_Exterior/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": "MtEmber_Exterior_EventScript_1C48E6",
"script": "MtEmber_Exterior_EventScript_ExplosionTutor",
"flag": "0"
},
{
data/maps/MtEmber_Exterior/text.inc
+4 -4
View File
@@ -1,4 +1,4 @@
Text_17A642:: @ 817A642
Text_ExplosionTeach:: @ 817A642
.string "Can you imagine?\n"
.string "If this volcano were to erupt?\p"
.string "The explosion would be the end of\n"
@@ -6,16 +6,16 @@ Text_17A642:: @ 817A642
.string "While we're terrified, would you\n"
.string "like me to teach EXPLOSION?$"
Text_17A6ED:: @ 817A6ED
Text_ExplosionDeclined:: @ 817A6ED
.string "Yeah, you're right.\n"
.string "It is too terrifying.$"
Text_17A717:: @ 817A717
Text_ExplosionWhichMon:: @ 817A717
.string "You're terribly brave!\p"
.string "Which POKéMON should I teach\n"
.string "EXPLOSION?$"
Text_17A756:: @ 817A756
Text_ExplosionTaught:: @ 817A756
.string "Using EXPLOSION while on this\n"
.string "volcano…\p"
.string "What a terrifying thrill!$"
data/maps/MtEmber_Summit/scripts.inc
+2 -2
View File
@@ -55,10 +55,10 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33
EventScript_163B96:: @ 8163B96
setflag FLAG_FOUGHT_MOLTRES
goto EventScript_1A922D
goto EventScript_RemoveStaticMon
end
EventScript_163B9F:: @ 8163B9F
setvar VAR_0x8004, SPECIES_MOLTRES
goto EventScript_1A9236
goto EventScript_MonFlewAway
end
data/maps/NavelRock_Base/scripts.inc
+2 -2
View File
@@ -78,10 +78,10 @@ NavelRock_Base_EventScript_165134:: @ 8165134
EventScript_1651D9:: @ 81651D9
setflag FLAG_LUGIA_FLEW_AWAY
setvar VAR_0x8004, SPECIES_LUGIA
goto EventScript_1A9236
goto EventScript_MonFlewAway
end
EventScript_1651E7:: @ 81651E7
setvar VAR_0x8004, SPECIES_LUGIA
goto EventScript_1A9236
goto EventScript_MonFlewAway
end
data/maps/NavelRock_Summit/scripts.inc
+2 -2
View File
@@ -83,12 +83,12 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
EventScript_1650B4:: @ 81650B4
setflag FLAG_HO_OH_FLEW_AWAY
setvar VAR_0x8004, SPECIES_HO_OH
goto EventScript_1A9236
goto EventScript_MonFlewAway
end
EventScript_1650C2:: @ 81650C2
setvar VAR_0x8004, SPECIES_HO_OH
goto EventScript_1A9236
goto EventScript_MonFlewAway
end
Movement_1650CD:: @ 81650CD
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+2 -2
View File
@@ -841,7 +841,7 @@ EventScript_1698D6:: @ 81698D6
end
EventScript_169903:: @ 8169903
call EventScript_1A737B
call ProfOak_EventScript_RatePokedexInPerson
goto_if_set FLAG_OAK_SAW_DEX_COMPLETION, EventScript_169913
release
end
@@ -963,7 +963,7 @@ Movement_1699C5:
step_end
EventScript_1699CE:: @ 81699CE
call EventScript_1A737B
call ProfOak_EventScript_RatePokedexInPerson
closemessage
compare VAR_0x8009, 60
goto_if_lt EventScript_1699F9
data/maps/PewterCity/text.inc
+4 -4
View File
@@ -1,4 +1,4 @@
Text_17E316:: @ 817E316
Text_DreamEaterTeach:: @ 817E316
.string "Yawn!\n"
.string "I must have dozed off in the sun.\p"
.string "I had this weird dream about\n"
@@ -9,14 +9,14 @@ Text_17E316:: @ 817E316
.string "Let me teach it to a POKéMON so\n"
.string "I can forget about it!$"
Text_17E3E9:: @ 817E3E9
Text_DreamEaterDeclined:: @ 817E3E9
.string "…Snore…$"
Text_17E3F1:: @ 817E3F1
Text_DreamEaterWhichMon:: @ 817E3F1
.string "Which POKéMON wants to learn\n"
.string "DREAM EATER?$"
Text_17E41B:: @ 817E41B
Text_DreamEaterTaught:: @ 817E41B
.string "…ZZZ…\n"
.string "I…can't eat…anymore…$"
data/maps/PewterCity_Mart/scripts.inc
+1 -1
View File
@@ -18,7 +18,7 @@ PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0
message Text_MayIHelpYou
waitmessage
pokemart Items_16A708
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
data/maps/PewterCity_Museum_1F/map.json
+1 -1
View File
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PewterCity_Museum_1F_EventScript_1C4BBE",
"script": "PewterCity_Museum_1F_EventScript_SeismicTossTutor",
"flag": "0"
}
],
data/maps/PewterCity_Museum_2F/text.inc
+4 -4
View File
@@ -1,4 +1,4 @@
Text_1909A3:: @ 81909A3
Text_SeismicTossTeach:: @ 81909A3
.string "The secrets of space…\n"
.string "The mysteries of earth…\p"
.string "There are so many things about\n"
@@ -9,15 +9,15 @@ Text_1909A3:: @ 81909A3
.string "Well, how about SEISMIC TOSS?\n"
.string "Should I teach that to a POKéMON?$"
Text_190AA9:: @ 8190AA9
Text_SeismicTossDeclined:: @ 8190AA9
.string "Is that so?\n"
.string "I'm sure you'll be back for it.$"
Text_190AD5:: @ 8190AD5
Text_SeismicTossWhichMon:: @ 8190AD5
.string "Which POKéMON wants to learn\n"
.string "SEISMIC TOSS?$"
Text_190B00:: @ 8190B00
Text_SeismicTossTaught:: @ 8190B00
.string "I hope you won't toss in the towel.\n"
.string "Keep it up.$"
data/maps/PewterCity_PokemonCenter_1F/map.json
+1 -1
View File
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PewterCity_PokemonCenter_1F_EventScript_1BEE16",
"script": "MysteryEventClub_EventScript_Man",
"flag": "0"
},
{
data/maps/PowerPlant/scripts.inc
+4 -4
View File
@@ -66,12 +66,12 @@ PowerPlant_EventScript_1637B8:: @ 81637B8
EventScript_16381B:: @ 816381B
setflag FLAG_FOUGHT_ZAPDOS
goto EventScript_1A922D
goto EventScript_RemoveStaticMon
end
EventScript_163824:: @ 8163824
setvar VAR_0x8004, SPECIES_ZAPDOS
goto EventScript_1A9236
goto EventScript_MonFlewAway
end
PowerPlant_EventScript_16382F:: @ 816382F
@@ -102,7 +102,7 @@ PowerPlant_EventScript_16382F:: @ 816382F
EventScript_163884:: @ 8163884
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1
goto EventScript_1A922D
goto EventScript_RemoveStaticMon
end
PowerPlant_EventScript_16388D:: @ 816388D
@@ -133,5 +133,5 @@ PowerPlant_EventScript_16388D:: @ 816388D
EventScript_1638E2:: @ 81638E2
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2
goto EventScript_1A922D
goto EventScript_RemoveStaticMon
end
data/maps/RockTunnel_B1F/map.json
+1 -1
View File
@@ -127,7 +127,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_B1F_EventScript_1C487E",
"script": "RockTunnel_B1F_EventScript_RockSlideTutor",
"flag": "0"
},
{
data/maps/RocketHideout_Elevator/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special Special_DrawElevatorCurrentFloorWindow
message Text_1A535C
message Text_WantWhichFloor
waitmessage
setvar VAR_0x8004, 2
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
data/maps/Route12/scripts.inc
+1 -1
View File
@@ -21,7 +21,7 @@ Route12_EventScript_168014:: @ 8168014
msgbox gUnknown_81853CC, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16808D
call EventScript_1A924B
call EventScript_AwakenSnorlax
setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
waitse
playmoncry SPECIES_SNORLAX, 2
data/maps/Route12/text.inc
+2 -2
View File
@@ -2,7 +2,7 @@ gUnknown_8185317:: @ 8185317
.string "A POKéMON is sprawled out in\n"
.string "a deep and comfortable slumber.$"
Text_185354:: @ 8185354
Text_SnorlaxWokeUp:: @ 8185354
.string "SNORLAX woke up!\p"
.string "It attacked in a grumpy rage!$"
@@ -14,7 +14,7 @@ gUnknown_8185383:: @ 8185383
gUnknown_81853CC:: @ 81853CC
.string "Want to use the POKé FLUTE?$"
Text_1853E8:: @ 81853E8
Text_PlayedPokeFlute:: @ 81853E8
.string "{PLAYER} played the POKé FLUTE.$"
Text_185402:: @ 8185402
data/maps/Route16/scripts.inc
+1 -1
View File
@@ -40,7 +40,7 @@ Route16_EventScript_168121:: @ 8168121
msgbox gUnknown_81853CC, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_168197
call EventScript_1A924B
call EventScript_AwakenSnorlax
setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
waitse
playmoncry SPECIES_SNORLAX, 2
data/maps/Route4/map.json
+2 -2
View File
@@ -86,7 +86,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route4_EventScript_1C494E",
"script": "Route4_EventScript_MegaPunchTutor",
"flag": "0"
},
{
@@ -99,7 +99,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route4_EventScript_1C49B6",
"script": "Route4_EventScript_MegaKickTutor",
"flag": "0"
},
{
data/maps/Route5/text.inc
+8 -8
View File
@@ -1,4 +1,4 @@
Text_1839D5:: @ 81839D5
Text_MegaPunchTeach:: @ 81839D5
.string "A punch of roaring ferocity!\p"
.string "Packed with destructive power!\p"
.string "When the chips are down,\n"
@@ -7,22 +7,22 @@ Text_1839D5:: @ 81839D5
.string "Now!\n"
.string "Let me teach it to your POKéMON!$"
Text_183A83:: @ 8183A83
Text_MegaPunchDeclined:: @ 8183A83
.string "You'll be back when you understand\n"
.string "the worth of MEGA PUNCH.$"
Text_183ABF:: @ 8183ABF
Text_MegaPunchWhichMon:: @ 8183ABF
.string "Fine!\n"
.string "Which POKéMON will learn it?$"
Text_183AE2:: @ 8183AE2
Text_MegaPunchTaught:: @ 8183AE2
.string "Now, we are comrades in the way of\n"
.string "punching!\p"
.string "You should go before you're seen\n"
.string "by the misguided fool who trains\l"
.string "only his silly kicking over there.$"
Text_183B74:: @ 8183B74
Text_MegaKickTeach:: @ 8183B74
.string "A kick of brutal ferocity!\p"
.string "Packed with destructive power!\p"
.string "When you get right down to it,\n"
@@ -31,15 +31,15 @@ Text_183B74:: @ 8183B74
.string "Okay!\n"
.string "I'll teach it to your POKéMON!$"
Text_183C25:: @ 8183C25
Text_MegaKickDeclined:: @ 8183C25
.string "You'll come crawling back when you\n"
.string "realize the value of MEGA KICK.$"
Text_183C68:: @ 8183C68
Text_MegaKickWhichMon:: @ 8183C68
.string "All right!\n"
.string "Which POKéMON wants to learn it?$"
Text_183C94:: @ 8183C94
Text_MegaKickTaught:: @ 8183C94
.string "Now, we are soul mates in the way\n"
.string "of kicking!\p"
.string "You should run before you're seen\n"
data/maps/SaffronCity_House1_2F/scripts.inc
+1 -1
View File
@@ -26,7 +26,7 @@ SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B
faceplayer
checkitem ITEM_POKE_DOLL, 1
compare VAR_RESULT, TRUE
goto_if_eq EventScript_1C4CF6
goto_if_eq EventScript_MimicTutor
checkplayergender
compare VAR_RESULT, MALE
call_if_eq EventScript_16EBB7
data/maps/SaffronCity_House1_2F/text.inc
+5 -5
View File
@@ -18,7 +18,7 @@ gUnknown_819ACF1:: @ 819ACF1
.string "COPYCAT: Hmm? Quit mimicking?\l"
.string "But that's my favorite hobby!$"
Text_19AD85:: @ 819AD85
Text_MimicTeach:: @ 819AD85
.string "Oh wow!\n"
.string "A POKé DOLL!\p"
.string "For me?\n"
@@ -26,14 +26,14 @@ Text_19AD85:: @ 819AD85
.string "You know what?\n"
.string "I can teach the move MIMIC.$"
Text_19ADD8:: @ 819ADD8
Text_MimicDeclined:: @ 819ADD8
.string "Don't you like MIMIC?$"
Text_19ADEE:: @ 819ADEE
Text_MimicWhichMon:: @ 819ADEE
.string "I really love MIMIC!\n"
.string "Who's going to learn it?$"
Text_19AE1C:: @ 819AE1C
Text_MimicTaughtMale:: @ 819AE1C
.string "{PLAYER}: Hi!\n"
.string "Thanks for earlier!\p"
.string "{PLAYER}: Pardon?\p"
@@ -42,7 +42,7 @@ Text_19AE1C:: @ 819AE1C
.string "COPYCAT: You bet!\n"
.string "It's a scream!$"
Text_19AE90:: @ 819AE90
Text_MimicTaughtFemale:: @ 819AE90
.string "{PLAYER}: Hi!\n"
.string "Thanks for what you did for us.\p"
.string "{PLAYER}: Pardon?\p"
data/maps/SaffronCity_Mart/scripts.inc
+1 -1
View File
@@ -18,7 +18,7 @@ SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5
message Text_MayIHelpYou
waitmessage
pokemart Items_16EFDC
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
data/maps/SeafoamIslands_B4F/scripts.inc
+2 -2
View File
@@ -185,14 +185,14 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
EventScript_16320F:: @ 816320F
setflag FLAG_FOUGHT_ARTICUNO
goto EventScript_1A922D
goto EventScript_RemoveStaticMon
EventScript_163217:: @ 8163217
end
EventScript_163218:: @ 8163218
setvar VAR_0x8004, SPECIES_ARTICUNO
goto EventScript_1A9236
goto EventScript_MonFlewAway
EventScript_163222:: @ 8163222
end
data/maps/SeafoamIslands_B4F/text.inc
+4 -4
View File
@@ -1,4 +1,4 @@
Text_1799E0:: @ 81799E0
Text_RockSlideTeach:: @ 81799E0
.string "When you're up on a rocky mountain\n"
.string "like this, rockslides are a threat.\p"
.string "Can you imagine?\n"
@@ -8,14 +8,14 @@ Text_1799E0:: @ 81799E0
.string "You don't seem to be scared.\n"
.string "Want to try using ROCK SLIDE?$"
Text_179AC0:: @ 8179AC0
Text_RockSlideDeclined:: @ 8179AC0
.string "Oh, so you are scared after all.$"
Text_179AE1:: @ 8179AE1
Text_RockSlideWhichMon:: @ 8179AE1
.string "Which POKéMON should I teach\n"
.string "ROCK SLIDE?$"
Text_179B0A:: @ 8179B0A
Text_RockSlideTaught:: @ 8179B0A
.string "It might be scary to use it in this\n"
.string "tunnel…$"
data/maps/SevenIsland/map.json
+1 -1
View File
@@ -34,7 +34,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_EventScript_1C4B56",
"script": "SevenIsland_EventScript_SwordsDanceTutor",
"flag": "0"
},
{
data/maps/SevenIsland/text.inc
+4 -4
View File
@@ -1,4 +1,4 @@
Text_182F01:: @ 8182F01
Text_SwordsDanceTeach:: @ 8182F01
.string "Not many people come out here.\p"
.string "If I train here, I'm convinced that\n"
.string "I'll get stronger and stronger.\p"
@@ -6,14 +6,14 @@ Text_182F01:: @ 8182F01
.string "How would you like to learn a move\n"
.string "like that? It's SWORDS DANCE.$"
Text_182FC1:: @ 8182FC1
Text_SwordsDanceDeclined:: @ 8182FC1
.string "Well, that's fine, too.$"
Text_182FD9:: @ 8182FD9
Text_SwordsDanceWhichMon:: @ 8182FD9
.string "All right, pick which POKéMON\n"
.string "I should teach it to.$"
Text_18300D:: @ 818300D
Text_SwordsDanceTaught:: @ 818300D
.string "If only we could keep getting\n"
.string "stronger and stronger, eh?$"
data/maps/SevenIsland_House_Room1/scripts.inc
+1 -1
View File
@@ -101,7 +101,7 @@ EventScript_170987:: @ 8170987
compare VAR_RESULT, NO
goto_if_eq EventScript_170A11
special LoadPlayerParty
call EventScript_1A4EAF
call EventScript_AskSaveGame
compare VAR_RESULT, 0
goto_if_eq EventScript_170A11
special SavePlayerParty
data/maps/SevenIsland_Mart/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ SevenIsland_Mart_EventScript_170B31:: @ 8170B31
message Text_MayIHelpYou
waitmessage
pokemart Items_170B58
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03
call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special Special_DrawElevatorCurrentFloorWindow
message Text_1A535C
message Text_WantWhichFloor
waitmessage
setvar VAR_0x8004, 6
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
+1 -1
View File
@@ -132,7 +132,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992
message Text_MayIHelpYou
waitmessage
pokemart Items_1649B8
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
data/maps/SilphCo_2F/map.json
+1 -1
View File
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SilphCo_2F_EventScript_16165A",
"script": "SilphCo_2F_EventScript_ThunderWaveTutor",
"flag": "0"
}
],
data/maps/SilphCo_2F/scripts.inc
+2 -2
View File
@@ -7,8 +7,8 @@ SilphCo_2F_OnLoad:: @ 8161647
call_if_unset FLAG_SILPH_2F_DOOR_2, EventScript_Close2FDoor2
end
SilphCo_2F_EventScript_16165A:: @ 816165A
goto EventScript_1C4816
SilphCo_2F_EventScript_ThunderWaveTutor:: @ 816165A
goto EventScript_ThunderWaveTutor
EventScript_16165F:: @ 816165F
end
data/maps/SilphCo_2F/text.inc
+4 -4
View File
@@ -44,7 +44,7 @@ gUnknown_81756E2:: @ 81756E2
.string "SILPH CO. will be associated with\n"
.string "TEAM ROCKET!$"
Text_175711:: @ 8175711
Text_ThunderWaveTeach:: @ 8175711
.string "Eeek!\n"
.string "No! Stop! Help!\p"
.string "Oh, you're not with TEAM ROCKET.\n"
@@ -52,15 +52,15 @@ Text_175711:: @ 8175711
.string "Will you forgive me if I teach\n"
.string "you the THUNDER WAVE technique?$"
Text_17579D:: @ 817579D
Text_ThunderWaveDeclined:: @ 817579D
.string "Oh…\n"
.string "But THUNDER WAVE is convenient…$"
Text_1757C1:: @ 81757C1
Text_ThunderWaveWhichMon:: @ 81757C1
.string "Which POKéMON should I teach\n"
.string "THUNDER WAVE?$"
Text_1757EC:: @ 81757EC
Text_ThunderWaveTaught:: @ 81757EC
.string "THUNDER WAVE causes paralysis in\n"
.string "the target POKéMON.\p"
.string "A paralyzed POKéMON may be unable\n"
data/maps/SilphCo_Elevator/scripts.inc
+1 -1
View File
@@ -7,7 +7,7 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F
call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special Special_DrawElevatorCurrentFloorWindow
message Text_1A535C
message Text_WantWhichFloor
waitmessage
setvar VAR_0x8004, 1
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
data/maps/SixIsland_Mart/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ SixIsland_Mart_EventScript_171E66:: @ 8171E66
message Text_MayIHelpYou
waitmessage
pokemart Items_171E8C
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
data/maps/SixIsland_WaterPath_House1/text.inc
+9 -9
View File
@@ -1,4 +1,4 @@
Text_1A46C6:: @ 81A46C6
Text_UltimateMoveThatMon:: @ 81A46C6
.string "I perfected the ultimate move of\n"
.string "its type…\p"
.string "But will no one take it for\n"
@@ -7,11 +7,11 @@ Text_1A46C6:: @ 81A46C6
.string "Y-you…\n"
.string "Th-that {STR_VAR_1}…$"
Text_1A4737:: @ 81A4737
Text_JustMistaken:: @ 81A4737
.string "…No…\n"
.string "I was just mistaken.$"
Text_1A4751:: @ 81A4751
Text_AllowMeToTeachMonUltimateMove:: @ 81A4751
.string "Oh! This is the one!\n"
.string "This is the POKéMON!\p"
.string "This {STR_VAR_1} is worthy of\n"
@@ -20,33 +20,33 @@ Text_1A4751:: @ 81A4751
.string "Will you allow your {STR_VAR_1} to\n"
.string "learn my {STR_VAR_2}?$"
Text_1A47E5:: @ 81A47E5
Text_YouRejectIt:: @ 81A47E5
.string "Gaah! You reject it?\n"
.string "No, I won't be dissuaded!$"
Text_1A4814:: @ 81A4814
Text_LetMeConferUltimateMove:: @ 81A4814
.string "You will allow it?\p"
.string "Then, let me confer my ultimate\n"
.string "{STR_VAR_2} on your {STR_VAR_1}.\p"
.string "Ggggrah-awooo!$"
Text_1A4865:: @ 81A4865
Text_TaughtMove:: @ 81A4865
.string "Gasp, gasp, gasp…\p"
.string "I didn't think I could teach that\n"
.string "move while I still lived…$"
Text_1A48B3:: @ 81A48B3
Text_MakeBestUseOfMove:: @ 81A48B3
.string "I implore you to make the best\n"
.string "use of that move and gain power!$"
Text_1A48F3:: @ 81A48F3
Text_PassedOnEverythingIKnow:: @ 81A48F3
.string "Gasp, gasp, gasp…\p"
.string "I have no regrets now.\n"
.string "I've passed on everything I know.\p"
.string "Now I can live out my life knowing\n"
.string "my work is done.$"
Text_1A4972:: @ 81A4972
Text_FeelRejuvenated:: @ 81A4972
.string "After I passed on my knowledge to\n"
.string "you, I felt so much relief.\p"
.string "In fact, I feel rejuvenated,\n"
data/maps/ThreeIsland_Mart/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ ThreeIsland_Mart_EventScript_17188D:: @ 817188D
message Text_MayIHelpYou
waitmessage
pokemart Items_1718B4
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
data/maps/TwoIsland/scripts.inc
+4 -4
View File
@@ -118,7 +118,7 @@ EventScript_1676A6:: @ 81676A6
EventScript_1676D3:: @ 81676D3
pokemart Items_1676E4
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
@@ -132,7 +132,7 @@ Items_1676E4:: @ 81676E4
EventScript_1676EC:: @ 81676EC
pokemart Items_1676FC
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
@@ -148,7 +148,7 @@ Items_1676FC:: @ 81676FC
EventScript_167708:: @ 8167708
pokemart Items_167718
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
@@ -166,7 +166,7 @@ Items_167718:: @ 8167718
EventScript_167728:: @ 8167728
pokemart Items_167738
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
data/maps/TwoIsland_CapeBrink_House/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": "TwoIsland_CapeBrink_House_EventScript_1C4DEC",
"script": "TwoIsland_CapeBrink_House_EventScript_StarterTutor",
"flag": "0"
}
],
data/maps/VermilionCity_Mart/scripts.inc
+1 -1
View File
@@ -18,7 +18,7 @@ VermilionCity_Mart_EventScript_16B666:: @ 816B666
message Text_MayIHelpYou
waitmessage
pokemart Items_16B68C
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
data/maps/VictoryRoad_2F/map.json
+1 -1
View File
@@ -179,7 +179,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "VictoryRoad_2F_EventScript_1C47AE",
"script": "VictoryRoad_2F_EventScript_DoubleEdgeTutor",
"flag": "0"
}
],
data/maps/VictoryRoad_3F/text.inc
+4 -4
View File
@@ -1,7 +1,7 @@
Text_1749F3:: @ 81749F3
.string "ギヤーオ！$"
Text_1749F9:: @ 81749F9
Text_DoubleEdgeTeach:: @ 81749F9
.string "You should be proud of yourself,\n"
.string "having battled your way through\l"
.string "VICTORY ROAD so courageously.\p"
@@ -10,15 +10,15 @@ Text_1749F9:: @ 81749F9
.string "Would you like me to teach that\n"
.string "technique?$"
Text_174ABC:: @ 8174ABC
Text_DoubleEdgeDeclined:: @ 8174ABC
.string "I'll teach you the technique\n"
.string "anytime.$"
Text_174AE2:: @ 8174AE2
Text_DoubleEdgeWhichMon:: @ 8174AE2
.string "Which POKéMON should I teach\n"
.string "DOUBLE-EDGE?$"
Text_174B0C:: @ 8174B0C
Text_DoubleEdgeTaught:: @ 8174B0C
.string "Keep that drive going for the\n"
.string "POKéMON LEAGUE!\p"
.string "Take a run at them and knock 'em\n"
data/maps/ViridianCity/map.json
+1 -1
View File
@@ -39,7 +39,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_EventScript_165AF0",
"script": "ViridianCity_EventScript_DreamEaterTutor",
"flag": "0"
},
{
data/maps/ViridianCity/scripts.inc
+2 -2
View File
@@ -192,8 +192,8 @@ EventScript_165ADB:: @ 8165ADB
release
end
ViridianCity_EventScript_165AF0:: @ 8165AF0
goto EventScript_1C4A1E
ViridianCity_EventScript_DreamEaterTutor:: @ 8165AF0
goto EventScript_DreamEaterTutor
end
ViridianCity_EventScript_165AF6:: @ 8165AF6
data/maps/ViridianCity_Mart/scripts.inc
+1 -1
View File
@@ -60,7 +60,7 @@ ViridianCity_Mart_EventScript_16A268:: @ 816A268
message Text_MayIHelpYou
waitmessage
pokemart Items_16A298
msgbox gUnknown_81A5190
msgbox Text_PleaseComeAgain
release
end
data/scripts/cable_club.inc
+7 -7
View File
@@ -22,7 +22,7 @@ CableClub_EventScript_MysteryGiftMan:: @ 81BB1D2
@ Unused
EventScript_1BB1E4:: @ 81BB1E4
msgbox Text_1A6393, MSGBOX_NPC
msgbox Text_ThankYouForAccessingMysteryGift, MSGBOX_NPC
end
CableClub_OnWarp:: @ 81BB1ED
@@ -283,7 +283,7 @@ EventScript_1BB541:: @ 81BB541
end
EventScript_1BB54C:: @ 81BB54C
call EventScript_1A4EAF
call EventScript_AskSaveGame
compare VAR_RESULT, 0
goto_if_eq EventScript_1BB82F
message gUnknown_81BC4AC
@@ -397,7 +397,7 @@ EventScript_1BB6AB:: @ 81BB6AB
call EventScript_1BB79C
compare VAR_RESULT, 0
goto_if_eq EventScript_1BB82F
call EventScript_1A4EAF
call EventScript_AskSaveGame
compare VAR_RESULT, 0
goto_if_eq EventScript_1BB82F
message gUnknown_81BC4AC
@@ -826,7 +826,7 @@ EventScript_1BBA94:: @ 81BBA94
call EventScript_1BBB1E
compare VAR_RESULT, 0
goto_if_eq EventScript_1BB82F
call EventScript_1A4EAF
call EventScript_AskSaveGame
compare VAR_RESULT, 0
goto_if_eq EventScript_1BB82F
msgbox gUnknown_81BD86A
@@ -1030,7 +1030,7 @@ EventScript_1BBD6E:: @ 81BBD6E
end
EventScript_1BBD6F:: @ 81BBD6F
call EventScript_1A4EAF
call EventScript_AskSaveGame
compare VAR_RESULT, 0
goto_if_eq EventScript_1BB82F
switch VAR_0x8004
@@ -1320,7 +1320,7 @@ EventScript_1BC13A:: @ 81BC13A
waitstate
compare VAR_0x8004, 6
goto_if_ge EventScript_1BB83F
call EventScript_1A4EAF
call EventScript_AskSaveGame
compare VAR_RESULT, 0
goto_if_eq EventScript_1BB83F
setvar VAR_0x8004, 4
@@ -1340,7 +1340,7 @@ EventScript_1BC184:: @ 81BC184
waitstate
compare VAR_0x8004, 6
goto_if_ge EventScript_1BB83F
call EventScript_1A4EAF
call EventScript_AskSaveGame
compare VAR_RESULT, 0
goto_if_eq EventScript_1BB83F
setvar VAR_0x8004, 6
data/scripts/field_moves.inc
+95 -95
View File
@@ -3,60 +3,60 @@ EventScript_InteractWithCutTreeObject:: @ 81BDF13
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
lockall
goto_if_unset FLAG_BADGE02_GET, EventScript_1BDF87
goto_if_unset FLAG_BADGE02_GET, EventScript_CantCutTree
checkpartymove MOVE_CUT
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_1BDF87
goto_if_eq EventScript_CantCutTree
setfieldeffectarg 0, VAR_RESULT
getpartymonname 0, VAR_RESULT
getmovename 1, MOVE_CUT
msgbox gUnknown_81BDF94, MSGBOX_YESNO
msgbox Text_CutTreeDown, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1BDF91
msgbox gUnknown_81BDFD7
goto_if_eq EventScript_DontCutTree
msgbox Text_MonUsedMove
closemessage
dofieldeffect FLDEFF_USE_CUT_ON_TREE
waitstate
goto EventScript_1BDF76
goto EventScript_CutTree
end
gUnknown_81BDF6B:: @ 81BDF6B
EventScript_FldEffCut:: @ 81BDF6B
lockall
dofieldeffect FLDEFF_USE_CUT_ON_TREE
waitstate
goto EventScript_1BDF76
goto EventScript_CutTree
end
EventScript_1BDF76:: @ 81BDF76
applymovement VAR_LAST_TALKED, Movement_1BDF85
EventScript_CutTree:: @ 81BDF76
applymovement VAR_LAST_TALKED, Movement_CutTree
waitmovement 0
removeobject VAR_LAST_TALKED
releaseall
end
Movement_1BDF85:: @ 81BDF85
Movement_CutTree:: @ 81BDF85
cut_tree
step_end
EventScript_1BDF87:: @ 81BDF87
msgbox gUnknown_81BDFE3, MSGBOX_SIGN
EventScript_CantCutTree:: @ 81BDF87
msgbox Text_TreeCanBeCutDown, MSGBOX_SIGN
releaseall
end
EventScript_1BDF91:: @ 81BDF91
EventScript_DontCutTree:: @ 81BDF91
closemessage
releaseall
end
gUnknown_81BDF94:: @ 81BDF94
Text_CutTreeDown:: @ 81BDF94
.string "This tree looks like it can be CUT\n"
.string "down!\p"
.string "Would you like to CUT it?$"
gUnknown_81BDFD7:: @ 81BDFD7
Text_MonUsedMove:: @ 81BDFD7
.string "{STR_VAR_1} used {STR_VAR_2}!$"
gUnknown_81BDFE3:: @ 81BDFE3
Text_TreeCanBeCutDown:: @ 81BDFE3
.string "This tree looks like it can be CUT\n"
.string "down!$"
@@ -65,63 +65,63 @@ EventScript_InteractWithRockSmashRockObject:: @ 81BE00C
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
lockall
goto_if_unset FLAG_BADGE06_GET, EventScript_1BE091
goto_if_unset FLAG_BADGE06_GET, EventScript_CantSmashRock
checkpartymove MOVE_ROCK_SMASH
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_1BE091
goto_if_eq EventScript_CantSmashRock
setfieldeffectarg 0, VAR_RESULT
getpartymonname 0, VAR_RESULT
getmovename 1, MOVE_ROCK_SMASH
msgbox Text_1BE09D, MSGBOX_YESNO
msgbox Text_UseRockSmash, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1BE09A
msgbox gUnknown_81BDFD7
goto_if_eq EventScript_DontSmashRock
msgbox Text_MonUsedMove
closemessage
dofieldeffect FLDEFF_USE_ROCK_SMASH
waitstate
goto EventScript_1BE06F
goto EventScript_UseRockSmash
end
EventScript_FldEffRockSmash:: @ 81BE064
lockall
dofieldeffect FLDEFF_USE_ROCK_SMASH
waitstate
goto EventScript_1BE06F
goto EventScript_UseRockSmash
end
EventScript_1BE06F:: @ 81BE06F
applymovement VAR_LAST_TALKED, Movement_1BE08F
EventScript_UseRockSmash:: @ 81BE06F
applymovement VAR_LAST_TALKED, Movement_BreakRock
waitmovement 0
removeobject VAR_LAST_TALKED
special ScrSpecial_RockSmashWildEncounter
compare VAR_RESULT, 0
goto_if_eq EventScript_1BE08D
compare VAR_RESULT, FALSE
goto_if_eq EventScript_RockSmashNoEncounter
waitstate
releaseall
end
EventScript_1BE08D:: @ 81BE08D
EventScript_RockSmashNoEncounter:: @ 81BE08D
releaseall
end
Movement_1BE08F:: @ 81BE08F
Movement_BreakRock:: @ 81BE08F
rock_smash_break
step_end
EventScript_1BE091:: @ 81BE091
msgbox gUnknown_81BE0E2, MSGBOX_SIGN
EventScript_CantSmashRock:: @ 81BE091
msgbox Text_MonMaySmashRock, MSGBOX_SIGN
end
EventScript_1BE09A:: @ 81BE09A
EventScript_DontSmashRock:: @ 81BE09A
closemessage
releaseall
end
Text_1BE09D:: @ 81BE09D
Text_UseRockSmash:: @ 81BE09D
.string "This rock appears to be breakable.\n"
.string "Would you like to use ROCK SMASH?$"
gUnknown_81BE0E2:: @ 81BE0E2
Text_MonMaySmashRock:: @ 81BE0E2
.string "It's a rugged rock, but a POKéMON\n"
.string "may be able to smash it.$"
@@ -130,177 +130,177 @@ EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
lockall
goto_if_unset FLAG_BADGE04_GET, EventScript_1BE185
goto_if_set FLAG_SYS_STRENGTH_ACTIVE, EventScript_1BE18E
goto_if_unset FLAG_BADGE04_GET, EventScript_CantMoveBoulder
goto_if_set FLAG_SYS_STRENGTH_ACTIVE, EventScript_AlreadyUsedStrength
checkpartymove MOVE_STRENGTH
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_1BE185
goto_if_eq EventScript_CantMoveBoulder
setfieldeffectarg 0, VAR_RESULT
msgbox gUnknown_81BE19A, MSGBOX_YESNO
msgbox Text_UseStrength, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1BE197
goto_if_eq EventScript_DontUseStrength
closemessage
dofieldeffect FLDEFF_USE_STRENGTH
waitstate
goto EventScript_1BE179
goto EventScript_UseStrength
end
EventScript_FldEffStrength:: @ 81BE16E
lockall
dofieldeffect FLDEFF_USE_STRENGTH
waitstate
goto EventScript_1BE179
goto EventScript_UseStrength
end
EventScript_1BE179:: @ 81BE179
EventScript_UseStrength:: @ 81BE179
setflag FLAG_SYS_STRENGTH_ACTIVE
msgbox gUnknown_81BE1FA, MSGBOX_SIGN
msgbox Text_MonUsedStrengthCanMoveBoulders, MSGBOX_SIGN
end
EventScript_1BE185:: @ 81BE185
msgbox gUnknown_81BE244, MSGBOX_SIGN
EventScript_CantMoveBoulder:: @ 81BE185
msgbox Text_MonMayPushBoulder, MSGBOX_SIGN
end
EventScript_1BE18E:: @ 81BE18E
msgbox gUnknown_81BE284, MSGBOX_SIGN
EventScript_AlreadyUsedStrength:: @ 81BE18E
msgbox Text_StrengthMadeMovingBouldersPossible, MSGBOX_SIGN
end
EventScript_1BE197:: @ 81BE197
EventScript_DontUseStrength:: @ 81BE197
closemessage
releaseall
end
gUnknown_81BE19A:: @ 81BE19A
Text_UseStrength:: @ 81BE19A
.string "It's a big boulder, but a POKéMON\n"
.string "may be able to push it aside.\p"
.string "Would you like to use STRENGTH?$"
gUnknown_81BE1FA:: @ 81BE1FA
Text_MonUsedStrengthCanMoveBoulders:: @ 81BE1FA
.string "{STR_VAR_1} used STRENGTH!\p"
.string "{STR_VAR_1}'s STRENGTH made it\n"
.string "possible to move boulders around!$"
gUnknown_81BE244:: @ 81BE244
Text_MonMayPushBoulder:: @ 81BE244
.string "It's a big boulder, but a POKéMON\n"
.string "may be able to push it aside.$"
gUnknown_81BE284:: @ 81BE284
Text_StrengthMadeMovingBouldersPossible:: @ 81BE284
.string "STRENGTH made it possible to move\n"
.string "boulders around.$"
gUnknown_81BE2B7:: @ 81BE2B7
EventScript_InteractWithWaterfall:: @ 81BE2B7
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
lockall
checkpartymove MOVE_WATERFALL
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_1BE300
goto_if_eq EventScript_WaterCrashingDown
getpartymonname 0, VAR_RESULT
setfieldeffectarg 0, VAR_RESULT
msgbox gUnknown_81BE33F, MSGBOX_YESNO
msgbox Text_UseWaterfall, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1BE308
msgbox gUnknown_81BE378
goto_if_eq EventScript_EndWaterfall
msgbox Text_MonUsedWaterfall
dofieldeffect FLDEFF_USE_WATERFALL
goto EventScript_1BE308
goto EventScript_EndWaterfall
EventScript_81BE2FF:: @ 81BE2FF
lockall
EventScript_1BE300:
msgbox gUnknown_81BE30A
EventScript_1BE308:
EventScript_WaterCrashingDown:
msgbox Text_WallOfWaterCrashingDown
EventScript_EndWaterfall:
releaseall
end
gUnknown_81BE30A:: @ 81BE30A
Text_WallOfWaterCrashingDown:: @ 81BE30A
.string "A wall of water is crashing down\n"
.string "with a mighty roar.$"
gUnknown_81BE33F:: @ 81BE33F
Text_UseWaterfall:: @ 81BE33F
.string "It's a large waterfall.\n"
.string "Would you like to use WATERFALL?$"
gUnknown_81BE378:: @ 81BE378
Text_MonUsedWaterfall:: @ 81BE378
.string "{STR_VAR_1} used WATERFALL.$"
@ Unused leftover from R/S
EventScript_1BE38B:: @ 81BE38B
EventScript_InteractWithDeepWater:: @ 81BE38B
lockall
checkpartymove MOVE_DIVE
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_1BE3CA
goto_if_eq EventScript_MayGoUnderwater
getpartymonname 0, VAR_RESULT
setfieldeffectarg 0, VAR_RESULT
setfieldeffectarg 1, 1
msgbox gUnknown_81BE469, MSGBOX_YESNO
msgbox Text_SeaIsDeepUseDive, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1BE3D2
msgbox gUnknown_81BE49B
goto_if_eq EventScript_EndDive
msgbox Text_MonUsedDive
dofieldeffect FLDEFF_USE_DIVE
goto EventScript_1BE3D2
goto EventScript_EndDive
EventScript_1BE3C9:: @ 81BE3C9
EventScript_CantDive:: @ 81BE3C9
lockall
EventScript_1BE3CA:
msgbox Text_1BE42B
EventScript_1BE3D2:
EventScript_MayGoUnderwater:
msgbox Text_MonMayGoUnderwater
EventScript_EndDive:
releaseall
end
EventScript_1BE3D4:: @ 81BE3D4
EventScript_TrySurface:: @ 81BE3D4
lockall
checkpartymove MOVE_DIVE
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_1BE412
goto_if_eq EventScript_CantSurface
getpartymonname 0, VAR_RESULT
setfieldeffectarg 0, VAR_RESULT
setfieldeffectarg 1, 1
msgbox gUnknown_81BE4EF, MSGBOX_YESNO
msgbox Text_LightFilteringUseDive, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1BE429
msgbox gUnknown_81BE49B
goto_if_eq EventScript_EndSurface
msgbox Text_MonUsedDive
dofieldeffect FLDEFF_USE_DIVE
goto EventScript_1BE429
goto EventScript_EndSurface
EventScript_1BE412:: @ 81BE412
EventScript_CantSurface:: @ 81BE412
lockall
msgbox gUnknown_81BE4A9
goto EventScript_1BE429
msgbox Text_MonMaySurface
goto EventScript_EndSurface
EventScript_1BE420:: @ 81BE420
EventScript_ObstacleCantSurface:: @ 81BE420
lockall
msgbox gUnknown_81BE52F
EventScript_1BE429:
msgbox Text_DiveCantBeUsedHere
EventScript_EndSurface:
releaseall
end
Text_1BE42B:: @ 81BE42B
Text_MonMayGoUnderwater:: @ 81BE42B
.string "The sea is deep here. A POKéMON\n"
.string "may be able to go underwater.$"
gUnknown_81BE469:: @ 81BE469
Text_SeaIsDeepUseDive:: @ 81BE469
.string "The sea is deep here.\n"
.string "Would you like to use DIVE?$"
gUnknown_81BE49B:: @ 81BE49B
Text_MonUsedDive:: @ 81BE49B
.string "{STR_VAR_1} used DIVE.$"
gUnknown_81BE4A9:: @ 81BE4A9
Text_MonMaySurface:: @ 81BE4A9
.string "Light is filtering down from above.\n"
.string "A POKéMON may be able to surface.$"
gUnknown_81BE4EF:: @ 81BE4EF
Text_LightFilteringUseDive:: @ 81BE4EF
.string "Light is filtering down from above.\n"
.string "Would you like to use DIVE?$"
gUnknown_81BE52F:: @ 81BE52F
Text_DiveCantBeUsedHere:: @ 81BE52F
.string "There is an obstacle above.\n"
.string "DIVE can't be used here.$"
EventScript_FailSweetScent:: @ 81BE564
msgbox Text_1BE56D, MSGBOX_SIGN
msgbox Text_LooksLikeNothingHere, MSGBOX_SIGN
end
Text_1BE56D:: @ 81BE56D
Text_LooksLikeNothingHere:: @ 81BE56D
.string "Looks like there's nothing here…$"
data/scripts/flash.inc
+1 -1
View File
@@ -1,4 +1,4 @@
EventScript_81BFB5F:: @ 81BFB5F
EventScript_FldEffFlash:: @ 81BFB5F
animateflash 0
setflashradius 0
end
data/scripts/hole.inc
+12 -7
View File
@@ -1,13 +1,17 @@
EventScript_1C1338:: @ 81C1338
map_script_2 VAR_0x4030, 0, EventScript_1C1348
@ Unused
EventScript_CheckFallDownHole:: @ 81C1338
map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole
.2byte 0
copyvar VAR_0x4030, 1
@ Unused
EventScript_FixCrackedGround::
copyvar VAR_ICE_STEP_COUNT, 1
end
EventScript_1C1348:: @ 81C1348
EventScript_FallDownHole:: @ 81C1348
lockall
delay 20
applymovement OBJ_EVENT_ID_PLAYER, Movement_1C137A
applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
waitmovement 0
playse SE_RU_HYUU
delay 60
@@ -15,10 +19,11 @@ EventScript_1C1348:: @ 81C1348
waitstate
end
@ TODO: EventScript_FallDownHoleMtPyre in pokeemerald, needs generic name
EventScript_1C1361:: @ 81C1361
lockall
delay 20
applymovement OBJ_EVENT_ID_PLAYER, Movement_1C137A
applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
waitmovement 0
playse SE_RU_HYUU
delay 60
@@ -26,6 +31,6 @@ EventScript_1C1361:: @ 81C1361
waitstate
end
Movement_1C137A:: @ 81C137A
Movement_SetInvisible: @ 81C137A
set_invisible
step_end
data/scripts/move_tutors.inc
+299 -298
View File
@@ -1,581 +1,582 @@
VictoryRoad_2F_EventScript_1C47AE:: @ 81C47AE
VictoryRoad_2F_EventScript_DoubleEdgeTutor:: @ 81C47AE
lock
faceplayer
goto_if_set FLAG_TUTOR_DOUBLE_EDGE, EventScript_1C480C
msgbox Text_1749F9, MSGBOX_YESNO
goto_if_set FLAG_TUTOR_DOUBLE_EDGE, EventScript_DoubleEdgeTaught
msgbox Text_DoubleEdgeTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1C4802
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4802
msgbox Text_174AE2
goto_if_eq EventScript_DoubleEdgeDeclined
call EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq EventScript_DoubleEdgeDeclined
msgbox Text_DoubleEdgeWhichMon
setvar VAR_0x8005, MOVETUTOR_DOUBLE_EDGE
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4802
call EventScript_ChooseMoveTutorMon
compare VAR_RESULT, FALSE
goto_if_eq EventScript_DoubleEdgeDeclined
setflag FLAG_TUTOR_DOUBLE_EDGE
goto EventScript_1C480C
goto EventScript_DoubleEdgeTaught
end
EventScript_1C4802:: @ 81C4802
msgbox Text_174ABC
EventScript_DoubleEdgeDeclined:: @ 81C4802
msgbox Text_DoubleEdgeDeclined
release
end
EventScript_1C480C:: @ 81C480C
msgbox Text_174B0C
EventScript_DoubleEdgeTaught:: @ 81C480C
msgbox Text_DoubleEdgeTaught
release
end
EventScript_1C4816:: @ 81C4816
EventScript_ThunderWaveTutor:: @ 81C4816
lock
faceplayer
goto_if_set FLAG_TUTOR_THUNDER_WAVE, EventScript_1C4874
msgbox Text_175711, MSGBOX_YESNO
goto_if_set FLAG_TUTOR_THUNDER_WAVE, EventScript_ThunderWaveTaught
msgbox Text_ThunderWaveTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1C486A
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if_eq EventScript_1C486A
msgbox Text_1757C1
goto_if_eq EventScript_ThunderWaveDeclined
call EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq EventScript_ThunderWaveDeclined
msgbox Text_ThunderWaveWhichMon
setvar VAR_0x8005, MOVETUTOR_THUNDER_WAVE
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if_eq EventScript_1C486A
call EventScript_ChooseMoveTutorMon
compare VAR_RESULT, FALSE
goto_if_eq EventScript_ThunderWaveDeclined
setflag FLAG_TUTOR_THUNDER_WAVE
goto EventScript_1C4874
goto EventScript_ThunderWaveTaught
end
EventScript_1C486A:: @ 81C486A
msgbox Text_17579D
EventScript_ThunderWaveDeclined:: @ 81C486A
msgbox Text_ThunderWaveDeclined
release
end
EventScript_1C4874:: @ 81C4874
msgbox Text_1757EC
EventScript_ThunderWaveTaught:: @ 81C4874
msgbox Text_ThunderWaveTaught
release
end
RockTunnel_B1F_EventScript_1C487E:: @ 81C487E
RockTunnel_B1F_EventScript_RockSlideTutor:: @ 81C487E
lock
faceplayer
goto_if_set FLAG_TUTOR_ROCK_SLIDE, EventScript_1C48DC
msgbox Text_1799E0, MSGBOX_YESNO
goto_if_set FLAG_TUTOR_ROCK_SLIDE, EventScript_RockSlideTaught
msgbox Text_RockSlideTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1C48D2
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if_eq EventScript_1C48D2
msgbox Text_179AE1
goto_if_eq EventScript_RockSlideDeclined
call EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq EventScript_RockSlideDeclined
msgbox Text_RockSlideWhichMon
setvar VAR_0x8005, MOVETUTOR_ROCK_SLIDE
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if_eq EventScript_1C48D2
call EventScript_ChooseMoveTutorMon
compare VAR_RESULT, FALSE
goto_if_eq EventScript_RockSlideDeclined
setflag FLAG_TUTOR_ROCK_SLIDE
goto EventScript_1C48DC
goto EventScript_RockSlideTaught
end
EventScript_1C48D2:: @ 81C48D2
msgbox Text_179AC0
EventScript_RockSlideDeclined:: @ 81C48D2
msgbox Text_RockSlideDeclined
release
end
EventScript_1C48DC:: @ 81C48DC
msgbox Text_179B0A
EventScript_RockSlideTaught:: @ 81C48DC
msgbox Text_RockSlideTaught
release
end
MtEmber_Exterior_EventScript_1C48E6:: @ 81C48E6
MtEmber_Exterior_EventScript_ExplosionTutor:: @ 81C48E6
lock
faceplayer
goto_if_set FLAG_TUTOR_EXPLOSION, EventScript_1C4944
msgbox Text_17A642, MSGBOX_YESNO
goto_if_set FLAG_TUTOR_EXPLOSION, EventScript_ExplosionTaught
msgbox Text_ExplosionTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1C493A
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if_eq EventScript_1C493A
msgbox Text_17A717
goto_if_eq EventScript_ExplosionDeclined
call EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq EventScript_ExplosionDeclined
msgbox Text_ExplosionWhichMon
setvar VAR_0x8005, MOVETUTOR_EXPLOSION
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if_eq EventScript_1C493A
call EventScript_ChooseMoveTutorMon
compare VAR_RESULT, FALSE
goto_if_eq EventScript_ExplosionDeclined
setflag FLAG_TUTOR_EXPLOSION
goto EventScript_1C4944
goto EventScript_ExplosionTaught
end
EventScript_1C493A:: @ 81C493A
msgbox Text_17A6ED
EventScript_ExplosionDeclined:: @ 81C493A
msgbox Text_ExplosionDeclined
release
end
EventScript_1C4944:: @ 81C4944
msgbox Text_17A756
EventScript_ExplosionTaught:: @ 81C4944
msgbox Text_ExplosionTaught
release
end
Route4_EventScript_1C494E:: @ 81C494E
Route4_EventScript_MegaPunchTutor:: @ 81C494E
lock
faceplayer
goto_if_set FLAG_TUTOR_META_PUNCH, EventScript_1C49AC
msgbox Text_1839D5, MSGBOX_YESNO
goto_if_set FLAG_TUTOR_MEGA_PUNCH, EventScript_MegaPunchTaught
msgbox Text_MegaPunchTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1C49A2
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if_eq EventScript_1C49A2
msgbox Text_183ABF
goto_if_eq EventScript_MegaPunchDeclined
call EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq EventScript_MegaPunchDeclined
msgbox Text_MegaPunchWhichMon
setvar VAR_0x8005, MOVETUTOR_MEGA_PUNCH
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if_eq EventScript_1C49A2
setflag FLAG_TUTOR_META_PUNCH
goto EventScript_1C49AC
call EventScript_ChooseMoveTutorMon
compare VAR_RESULT, FALSE
goto_if_eq EventScript_MegaPunchDeclined
setflag FLAG_TUTOR_MEGA_PUNCH
goto EventScript_MegaPunchTaught
end
EventScript_1C49A2:: @ 81C49A2
msgbox Text_183A83
EventScript_MegaPunchDeclined:: @ 81C49A2
msgbox Text_MegaPunchDeclined
release
end
EventScript_1C49AC:: @ 81C49AC
msgbox Text_183AE2
EventScript_MegaPunchTaught:: @ 81C49AC
msgbox Text_MegaPunchTaught
release
end
Route4_EventScript_1C49B6:: @ 81C49B6
Route4_EventScript_MegaKickTutor:: @ 81C49B6
lock
faceplayer
goto_if_set FLAG_TUTOR_MEGA_KICK, EventScript_1C4A14
msgbox Text_183B74, MSGBOX_YESNO
goto_if_set FLAG_TUTOR_MEGA_KICK, EventScript_MegaKickTaught
msgbox Text_MegaKickTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1C4A0A
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4A0A
msgbox Text_183C68
goto_if_eq EventScript_MegaKickDeclined
call EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq EventScript_MegaKickDeclined
msgbox Text_MegaKickWhichMon
setvar VAR_0x8005, MOVETUTOR_MEGA_KICK
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4A0A
call EventScript_ChooseMoveTutorMon
compare VAR_RESULT, FALSE
goto_if_eq EventScript_MegaKickDeclined
setflag FLAG_TUTOR_MEGA_KICK
goto EventScript_1C4A14
goto EventScript_MegaKickTaught
end
EventScript_1C4A0A:: @ 81C4A0A
msgbox Text_183C25
EventScript_MegaKickDeclined:: @ 81C4A0A
msgbox Text_MegaKickDeclined
release
end
EventScript_1C4A14:: @ 81C4A14
msgbox Text_183C94
EventScript_MegaKickTaught:: @ 81C4A14
msgbox Text_MegaKickTaught
release
end
EventScript_1C4A1E:: @ 81C4A1E
EventScript_DreamEaterTutor:: @ 81C4A1E
lock
faceplayer
goto_if_set FLAG_TUTOR_DREAM_EATER, EventScript_1C4A7C
msgbox Text_17E316, MSGBOX_YESNO
goto_if_set FLAG_TUTOR_DREAM_EATER, EventScript_DreamEaterTaught
msgbox Text_DreamEaterTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1C4A72
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4A72
msgbox Text_17E3F1
goto_if_eq EventScript_DreamEaterDeclined
call EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq EventScript_DreamEaterDeclined
msgbox Text_DreamEaterWhichMon
setvar VAR_0x8005, MOVETUTOR_DREAM_EATER
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4A72
call EventScript_ChooseMoveTutorMon
compare VAR_RESULT, FALSE
goto_if_eq EventScript_DreamEaterDeclined
setflag FLAG_TUTOR_DREAM_EATER
goto EventScript_1C4A7C
goto EventScript_DreamEaterTaught
end
EventScript_1C4A72:: @ 81C4A72
msgbox Text_17E3E9
EventScript_DreamEaterDeclined:: @ 81C4A72
msgbox Text_DreamEaterDeclined
release
end
EventScript_1C4A7C:: @ 81C4A7C
msgbox Text_17E41B
EventScript_DreamEaterTaught:: @ 81C4A7C
msgbox Text_DreamEaterTaught
release
end
EventScript_1C4A86:: @ 81C4A86
EventScript_SoftboiledTutor:: @ 81C4A86
lock
faceplayer
goto_if_set FLAG_TUTOR_SOFT_BOILED, EventScript_1C4AE4
msgbox Text_180388, MSGBOX_YESNO
goto_if_set FLAG_TUTOR_SOFT_BOILED, EventScript_SoftboiledTaught
msgbox Text_SoftboiledTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1C4ADA
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4ADA
msgbox Text_180484
goto_if_eq EventScript_SoftboiledDeclined
call EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq EventScript_SoftboiledDeclined
msgbox Text_SoftboiledWhichMon
setvar VAR_0x8005, MOVETUTOR_SOFT_BOILED
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4ADA
call EventScript_ChooseMoveTutorMon
compare VAR_RESULT, FALSE
goto_if_eq EventScript_SoftboiledDeclined
setflag FLAG_TUTOR_SOFT_BOILED
goto EventScript_1C4AE4
goto EventScript_SoftboiledTaught
end
EventScript_1C4ADA:: @ 81C4ADA
msgbox Text_18043F
EventScript_SoftboiledDeclined:: @ 81C4ADA
msgbox Text_SoftboiledDeclined
release
end
EventScript_1C4AE4:: @ 81C4AE4
msgbox Text_1804C4
EventScript_SoftboiledTaught:: @ 81C4AE4
msgbox Text_SoftboiledTaught
release
end
FuchsiaCity_EventScript_1C4AEE:: @ 81C4AEE
FuchsiaCity_EventScript_SubstituteTutor:: @ 81C4AEE
lock
faceplayer
goto_if_set FLAG_TUTOR_SUBSTITUTE, EventScript_1C4B4C
msgbox Text_180948, MSGBOX_YESNO
goto_if_set FLAG_TUTOR_SUBSTITUTE, EventScript_SubstituteTaught
msgbox Text_SubstituteTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1C4B42
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4B42
msgbox Text_180A57
goto_if_eq EventScript_SubstituteDeclined
call EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq EventScript_SubstituteDeclined
msgbox Text_SubstituteWhichMon
setvar VAR_0x8005, MOVETUTOR_SUBSTITUTE
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4B42
call EventScript_ChooseMoveTutorMon
compare VAR_RESULT, FALSE
goto_if_eq EventScript_SubstituteDeclined
setflag FLAG_TUTOR_SUBSTITUTE
goto EventScript_1C4B4C
goto EventScript_SubstituteTaught
end
EventScript_1C4B42:: @ 81C4B42
msgbox Text_180A32
EventScript_SubstituteDeclined:: @ 81C4B42
msgbox Text_SubstituteDeclined
release
end
EventScript_1C4B4C:: @ 81C4B4C
msgbox Text_180A80
EventScript_SubstituteTaught:: @ 81C4B4C
msgbox Text_SubstituteTaught
release
end
SevenIsland_EventScript_1C4B56:: @ 81C4B56
SevenIsland_EventScript_SwordsDanceTutor:: @ 81C4B56
lock
faceplayer
goto_if_set FLAG_TUTOR_SWORDS_DANCE, EventScript_1C4BB4
msgbox Text_182F01, MSGBOX_YESNO
goto_if_set FLAG_TUTOR_SWORDS_DANCE, EventScript_SwordsDanceTaught
msgbox Text_SwordsDanceTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1C4BAA
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4BAA
msgbox Text_182FD9
goto_if_eq EventScript_SwordsDanceDeclined
call EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq EventScript_SwordsDanceDeclined
msgbox Text_SwordsDanceWhichMon
setvar VAR_0x8005, MOVETUTOR_SWORDS_DANCE
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4BAA
call EventScript_ChooseMoveTutorMon
compare VAR_RESULT, FALSE
goto_if_eq EventScript_SwordsDanceDeclined
setflag FLAG_TUTOR_SWORDS_DANCE
goto EventScript_1C4BB4
goto EventScript_SwordsDanceTaught
end
EventScript_1C4BAA:: @ 81C4BAA
msgbox Text_182FC1
EventScript_SwordsDanceDeclined:: @ 81C4BAA
msgbox Text_SwordsDanceDeclined
release
end
EventScript_1C4BB4:: @ 81C4BB4
msgbox Text_18300D
EventScript_SwordsDanceTaught:: @ 81C4BB4
msgbox Text_SwordsDanceTaught
release
end
PewterCity_Museum_1F_EventScript_1C4BBE:: @ 81C4BBE
PewterCity_Museum_1F_EventScript_SeismicTossTutor:: @ 81C4BBE
lock
faceplayer
goto_if_set FLAG_TUTOR_SEISMIC_TOSS, EventScript_1C4C1C
msgbox Text_1909A3, MSGBOX_YESNO
goto_if_set FLAG_TUTOR_SEISMIC_TOSS, EventScript_SeismicTossTaught
msgbox Text_SeismicTossTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1C4C12
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4C12
msgbox Text_190AD5
goto_if_eq EventScript_SeismicTossDeclined
call EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq EventScript_SeismicTossDeclined
msgbox Text_SeismicTossWhichMon
setvar VAR_0x8005, MOVETUTOR_SEISMIC_TOSS
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4C12
call EventScript_ChooseMoveTutorMon
compare VAR_RESULT, FALSE
goto_if_eq EventScript_SeismicTossDeclined
setflag FLAG_TUTOR_SEISMIC_TOSS
goto EventScript_1C4C1C
goto EventScript_SeismicTossTaught
end
EventScript_1C4C12:: @ 81C4C12
msgbox Text_190AA9
EventScript_SeismicTossDeclined:: @ 81C4C12
msgbox Text_SeismicTossDeclined
release
end
EventScript_1C4C1C:: @ 81C4C1C
msgbox Text_190B00
EventScript_SeismicTossTaught:: @ 81C4C1C
msgbox Text_SeismicTossTaught
release
end
EventScript_1C4C26:: @ 81C4C26
EventScript_CounterTutor:: @ 81C4C26
lock
faceplayer
goto_if_set FLAG_TUTOR_COUNTER, EventScript_1C4C84
msgbox Text_195928, MSGBOX_YESNO
goto_if_set FLAG_TUTOR_COUNTER, EventScript_CounterTaught
msgbox Text_CounterTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1C4C7A
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4C7A
msgbox Text_195A08
goto_if_eq EventScript_CounterDeclined
call EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq EventScript_CounterDeclined
msgbox Text_CounterWhichMon
setvar VAR_0x8005, MOVETUTOR_COUNTER
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4C7A
call EventScript_ChooseMoveTutorMon
compare VAR_RESULT, FALSE
goto_if_eq EventScript_CounterDeclined
setflag FLAG_TUTOR_COUNTER
goto EventScript_1C4C84
goto EventScript_CounterTaught
end
EventScript_1C4C7A:: @ 81C4C7A
msgbox Text_1959CC
EventScript_CounterDeclined:: @ 81C4C7A
msgbox Text_CounterDeclined
release
end
EventScript_1C4C84:: @ 81C4C84
msgbox Text_195A31
EventScript_CounterTaught:: @ 81C4C84
msgbox Text_CounterTaught
release
end
EventScript_1C4C8E:: @ 81C4C8E
EventScript_MetronomeTutor:: @ 81C4C8E
lock
faceplayer
goto_if_set FLAG_TUTOR_METRONOME, EventScript_1C4CEC
msgbox Text_19A137, MSGBOX_YESNO
goto_if_set FLAG_TUTOR_METRONOME, EventScript_MetronomeTaught
msgbox Text_MetronomeTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1C4CE2
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4CE2
msgbox Text_19A1EA
goto_if_eq EventScript_MetronomeDeclined
call EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq EventScript_MetronomeDeclined
msgbox Text_MetronomeWhichMon
setvar VAR_0x8005, MOVETUTOR_METRONOME
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4CE2
call EventScript_ChooseMoveTutorMon
compare VAR_RESULT, FALSE
goto_if_eq EventScript_MetronomeDeclined
setflag FLAG_TUTOR_METRONOME
goto EventScript_1C4CEC
goto EventScript_MetronomeTaught
end
EventScript_1C4CE2:: @ 81C4CE2
msgbox Text_19A1CB
EventScript_MetronomeDeclined:: @ 81C4CE2
msgbox Text_MetronomeDeclined
release
end
EventScript_1C4CEC:: @ 81C4CEC
msgbox Text_19A20E
EventScript_MetronomeTaught:: @ 81C4CEC
msgbox Text_MetronomeTaught
release
end
EventScript_1C4CF6:: @ 81C4CF6
goto_if_set FLAG_TUTOR_MIMIC, EventScript_1C4D59
msgbox Text_19AD85, MSGBOX_YESNO
EventScript_MimicTutor:: @ 81C4CF6
goto_if_set FLAG_TUTOR_MIMIC, EventScript_MimicTaught
msgbox Text_MimicTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1C4D4F
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4D4F
msgbox Text_19ADEE
goto_if_eq EventScript_MimicDeclined
call EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq EventScript_MimicDeclined
msgbox Text_MimicWhichMon
setvar VAR_0x8005, MOVETUTOR_MIMIC
call EventScript_1C4F30
call EventScript_ChooseMoveTutorMon
lock
faceplayer
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4D4F
goto_if_eq EventScript_MimicDeclined
removeitem ITEM_POKE_DOLL, 1
setflag FLAG_TUTOR_MIMIC
goto EventScript_1C4D59
goto EventScript_MimicTaught
end
EventScript_1C4D4F:: @ 81C4D4F
msgbox Text_19ADD8
EventScript_MimicDeclined:: @ 81C4D4F
msgbox Text_MimicDeclined
release
end
EventScript_1C4D59:: @ 81C4D59
EventScript_MimicTaught:: @ 81C4D59
checkplayergender
compare VAR_RESULT, MALE
call_if_eq EventScript_1C4D72
call_if_eq EventScript_MimicTaughtMale
compare VAR_RESULT, FEMALE
call_if_eq EventScript_1C4D7B
call_if_eq EventScript_MimicTaughtFemale
release
end
EventScript_1C4D72:: @ 81C4D72
msgbox Text_19AE1C
EventScript_MimicTaughtMale:: @ 81C4D72
msgbox Text_MimicTaughtMale
return
EventScript_1C4D7B:: @ 81C4D7B
msgbox Text_19AE90
EventScript_MimicTaughtFemale:: @ 81C4D7B
msgbox Text_MimicTaughtFemale
return
FourIsland_House1_EventScript_1C4D84:: @ 81C4D84
FourIsland_House1_EventScript_BodySlamTutor:: @ 81C4D84
lock
faceplayer
goto_if_set FLAG_TUTOR_BODY_SLAM, EventScript_1C4DE2
msgbox Text_1A3505, MSGBOX_YESNO
goto_if_set FLAG_TUTOR_BODY_SLAM, EventScript_BodySlamTaught
msgbox Text_BodySlamTeach, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1C4DD8
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4DD8
msgbox Text_1A35DA
goto_if_eq EventScript_BodySlamDeclined
call EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq EventScript_BodySlamDeclined
msgbox Text_BodySlamWhichMon
setvar VAR_0x8005, MOVETUTOR_BODY_SLAM
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4DD8
call EventScript_ChooseMoveTutorMon
compare VAR_RESULT, FALSE
goto_if_eq EventScript_BodySlamDeclined
setflag FLAG_TUTOR_BODY_SLAM
goto EventScript_1C4DE2
goto EventScript_BodySlamTaught
end
EventScript_1C4DD8:: @ 81C4DD8
msgbox Text_1A35C7
EventScript_BodySlamDeclined:: @ 81C4DD8
msgbox Text_BodySlamDeclined
release
end
EventScript_1C4DE2:: @ 81C4DE2
msgbox Text_1A3609
EventScript_BodySlamTaught:: @ 81C4DE2
msgbox Text_BodySlamTaught
release
end
TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC
TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
faceplayer
goto_if_set FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK, EventScript_1C4EA1
goto_if_set FLAG_TEMP_2, EventScript_1C4E97
goto_if_set FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK, CapeBrinkTutor_EventScript_TaughtAllMoves
goto_if_set FLAG_TEMP_2, CapeBrinkTutor_EventScript_MoveJustTaught
getfirstpartymonname 0
msgbox Text_1A46C6
msgbox Text_UltimateMoveThatMon
specialvar VAR_RESULT, Special_CapeBrinkGetMoveToTeachLeadPokemon
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4F26
compare VAR_RESULT, FALSE
goto_if_eq CapeBrinkTutor_EventScript_NoLeadStarter
copyvar VAR_0x8009, VAR_0x8005
compare VAR_FACING, DIR_NORTH
call_if_eq EventScript_1C4EF0
call_if_eq CapeBrinkTutor_EventScript_JumpInPlaceDown
compare VAR_FACING, DIR_SOUTH
call_if_eq EventScript_1C4EFB
call_if_eq CapeBrinkTutor_EventScript_JumpInPlaceUp
compare VAR_FACING, DIR_EAST
call_if_eq EventScript_1C4F06
call_if_eq CapeBrinkTutor_EventScript_JumpInPlaceLeft
compare VAR_FACING, DIR_WEST
call_if_eq EventScript_1C4F11
msgbox Text_1A4751, MSGBOX_YESNO
call_if_eq CapeBrinkTutor_EventScript_JumpInPlaceRight
msgbox Text_AllowMeToTeachMonUltimateMove, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1C4F1C
call EventScript_1C4F37
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4F1C
msgbox Text_1A4814
goto_if_eq CapeBrinkTutor_EventScript_DeclineMove
call EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, NO
goto_if_eq CapeBrinkTutor_EventScript_DeclineMove
msgbox Text_LetMeConferUltimateMove
closemessage
fadescreen FADE_TO_BLACK
goto EventScript_1C4EDA
goto CapeBrinkTutor_EventScript_ChooseMon
EventScript_1C4E8F:: @ 81C4E8F
@ Unused
CapeBrinkTutor_EventScript_FadeTaughtMove:: @ 81C4E8F
fadescreen FADE_FROM_BLACK
goto EventScript_1C4EAB
goto CapeBrinkTutor_EventScript_TaughtMove
end
EventScript_1C4E97:: @ 81C4E97
msgbox Text_1A48B3
CapeBrinkTutor_EventScript_MoveJustTaught:: @ 81C4E97
msgbox Text_MakeBestUseOfMove
release
end
EventScript_1C4EA1:: @ 81C4EA1
msgbox Text_1A4972
CapeBrinkTutor_EventScript_TaughtAllMoves:: @ 81C4EA1
msgbox Text_FeelRejuvenated
release
end
EventScript_1C4EAB:: @ 81C4EAB
CapeBrinkTutor_EventScript_TaughtMove:: @ 81C4EAB
copyvar VAR_0x8005, VAR_0x8009
specialvar VAR_RESULT, Special_HasLearnedAllMovesFromCapeBrinkTutor
compare VAR_RESULT, 1
goto_if_eq EventScript_1C4ECD
msgbox Text_1A4865
compare VAR_RESULT, TRUE
goto_if_eq CapeBrinkTutor_EventScript_LearnedAllMoves
msgbox Text_TaughtMove
setflag FLAG_TEMP_2
release
end
EventScript_1C4ECD:: @ 81C4ECD
msgbox Text_1A48F3
CapeBrinkTutor_EventScript_LearnedAllMoves:: @ 81C4ECD
msgbox Text_PassedOnEverythingIKnow
setflag FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK
release
end
EventScript_1C4EDA:: @ 81C4EDA
call EventScript_1C4F30
compare VAR_RESULT, 0
goto_if_eq EventScript_1C4F1C
goto EventScript_1C4EAB
CapeBrinkTutor_EventScript_ChooseMon:: @ 81C4EDA
call EventScript_ChooseMoveTutorMon
compare VAR_RESULT, FALSE
goto_if_eq CapeBrinkTutor_EventScript_DeclineMove
goto CapeBrinkTutor_EventScript_TaughtMove
end
EventScript_1C4EF0:: @ 81C4EF0
applymovement 1, Movement_1C4F4C
CapeBrinkTutor_EventScript_JumpInPlaceDown:: @ 81C4EF0
applymovement 1, Movement_JumpInPlaceDown
waitmovement 0
return
EventScript_1C4EFB:: @ 81C4EFB
applymovement 1, Movement_1C4F4E
CapeBrinkTutor_EventScript_JumpInPlaceUp:: @ 81C4EFB
applymovement 1, Movement_JumpInPlaceUp
waitmovement 0
return
EventScript_1C4F06:: @ 81C4F06
applymovement 1, Movement_1C4F50
CapeBrinkTutor_EventScript_JumpInPlaceLeft:: @ 81C4F06
applymovement 1, Movement_JumpInPlaceLeft
waitmovement 0
return
EventScript_1C4F11:: @ 81C4F11
applymovement 1, Movement_1C4F52
CapeBrinkTutor_EventScript_JumpInPlaceRight:: @ 81C4F11
applymovement 1, Movement_JumpInPlaceRight
waitmovement 0
return
EventScript_1C4F1C:: @ 81C4F1C
msgbox Text_1A47E5
CapeBrinkTutor_EventScript_DeclineMove:: @ 81C4F1C
msgbox Text_YouRejectIt
release
end
EventScript_1C4F26:: @ 81C4F26
msgbox Text_1A4737
CapeBrinkTutor_EventScript_NoLeadStarter:: @ 81C4F26
msgbox Text_JustMistaken
release
end
EventScript_1C4F30:: @ 81C4F30
EventScript_ChooseMoveTutorMon:: @ 81C4F30
special ChooseMonForMoveTutor
waitstate
lock
faceplayer
return
EventScript_1C4F37:: @ 81C4F37
EventScript_CanOnlyBeLearnedOnce:: @ 81C4F37
textcolor 3
special sub_80699BC
signmsg
msgbox Text_1A644F, MSGBOX_YESNO
msgbox Text_MoveCanOnlyBeLearnedOnce, MSGBOX_YESNO
normalmsg
call EventScript_1A6675
return
Movement_1C4F4C:: @ 81C4F4C
Movement_JumpInPlaceDown: @ 81C4F4C
jump_in_place_down
step_end
Movement_1C4F4E:: @ 81C4F4E
Movement_JumpInPlaceUp: @ 81C4F4E
jump_in_place_up
step_end
Movement_1C4F50:: @ 81C4F50
Movement_JumpInPlaceLeft: @ 81C4F50
jump_in_place_left
step_end
Movement_1C4F52:: @ 81C4F52
Movement_JumpInPlaceRight: @ 81C4F52
jump_in_place_right
step_end
data/scripts/mystery_event_club.inc
+68 -66
View File
@@ -1,116 +1,118 @@
PewterCity_PokemonCenter_1F_EventScript_1BEE16:: @ 81BEE16
.equ GAVE_PROFILE, VAR_TEMP_1
MysteryEventClub_EventScript_Man:: @ 81BEE16
lock
faceplayer
compare VAR_TEMP_1, 1
goto_if_eq EventScript_1BEE3A
goto_if_set FLAG_SYS_SET_TRAINER_CARD_PROFILE, EventScript_1BEECD
msgbox Text_1BEF88
goto EventScript_1BEE44
compare GAVE_PROFILE, TRUE
goto_if_eq EventScript_AlreadyGaveProfile
goto_if_set FLAG_SYS_SET_TRAINER_CARD_PROFILE, EventScript_GivenProfileBefore
msgbox Text_IdLoveToHearYourProfile
goto EventScript_AskForProfile
end
EventScript_1BEE3A:: @ 81BEE3A
msgbox gUnknown_81BF36A
EventScript_AlreadyGaveProfile: @ 81BEE3A
msgbox Text_TellMoreNextTime
release
end
EventScript_1BEE44:: @ 81BEE44
message Text_1BF017
EventScript_AskForProfile: @ 81BEE44
message Text_TellMeWhatsYourProfile
waitmessage
multichoice 18, 6, MULTICHOICE_YES_NO_INFO_2, FALSE
switch VAR_RESULT
case 0, EventScript_1BEE8F
case 1, EventScript_1BEEC3
case 2, EventScript_1BEE81
case SCR_MENU_CANCEL, EventScript_1BEEC3
case 0, EventScript_AcceptGiveProfile
case 1, EventScript_DeclineGiveProfile
case 2, EventScript_ProfileInfo
case SCR_MENU_CANCEL, EventScript_DeclineGiveProfile
end
EventScript_1BEE81:: @ 81BEE81
msgbox gUnknown_81BF053
goto EventScript_1BEE44
EventScript_ProfileInfo: @ 81BEE81
msgbox Text_ExplainProfile
goto EventScript_AskForProfile
end
EventScript_1BEE8F:: @ 81BEE8F
msgbox gUnknown_81BF166
EventScript_AcceptGiveProfile: @ 81BEE8F
msgbox Text_WhatsYourProfile
closemessage
goto EventScript_1BEF5A
goto EventScript_GiveProfile
end
EventScript_1BEE9E:: @ 81BEE9E
msgbox gUnknown_81BF1B2
EventScript_CancelGiveProfile: @ 81BEE9E
msgbox Text_DecidedNotTo
release
end
EventScript_1BEEA8:: @ 81BEEA8
setvar VAR_TEMP_1, 1
EventScript_GaveProfile: @ 81BEEA8
setvar GAVE_PROFILE, TRUE
setvar VAR_0x8004, 0
special Special_BufferEasyChatMessage
waitmessage
delay 80
msgbox gUnknown_81BF28E
msgbox Text_ProfileSaysSomethingAboutYou
release
end
EventScript_1BEEC3:: @ 81BEEC3
msgbox gUnknown_81BF17B
EventScript_DeclineGiveProfile: @ 81BEEC3
msgbox Text_DontBeLikeThat
release
end
EventScript_1BEECD:: @ 81BEECD
msgbox gUnknown_81BF1E8
goto EventScript_1BEEDB
EventScript_GivenProfileBefore: @ 81BEECD
msgbox Text_HiWeMeetAgain
goto EventScript_AskForNewProfile
end
EventScript_1BEEDB:: @ 81BEEDB
message Text_1BF1FB
EventScript_AskForNewProfile: @ 81BEEDB
message Text_ChangeYourProfile
waitmessage
multichoice 18, 6, MULTICHOICE_YES_NO_INFO_2, FALSE
switch VAR_RESULT
case 0, EventScript_1BEF26
case 1, EventScript_1BEF35
case 2, EventScript_1BEF18
case SCR_MENU_CANCEL, EventScript_1BEF35
case 0, EventScript_AcceptGiveNewProfile
case 1, EventScript_DeclineGiveNewProfile
case 2, EventScript_ProfileInfo2
case SCR_MENU_CANCEL, EventScript_DeclineGiveNewProfile
end
EventScript_1BEF18:: @ 81BEF18
msgbox gUnknown_81BF053
goto EventScript_1BEEDB
EventScript_ProfileInfo2: @ 81BEF18
msgbox Text_ExplainProfile
goto EventScript_AskForNewProfile
end
EventScript_1BEF26:: @ 81BEF26
msgbox gUnknown_81BF222
EventScript_AcceptGiveNewProfile: @ 81BEF26
msgbox Text_WhatAreYouLikeNow
closemessage
goto EventScript_1BEF5A
goto EventScript_GiveProfile
end
EventScript_1BEF35:: @ 81BEF35
msgbox gUnknown_81BF252
EventScript_DeclineGiveNewProfile: @ 81BEF35
msgbox Text_LikeProfileWayItIs
release
end
EventScript_1BEF3F:: @ 81BEF3F
setvar VAR_TEMP_1, 1
EventScript_GaveSpecialProfile: @ 81BEF3F
setvar GAVE_PROFILE, TRUE
setvar VAR_0x8004, 0
special Special_BufferEasyChatMessage
waitmessage
delay 80
msgbox gUnknown_81BF30D
msgbox Text_HeardThatBefore
release
end
EventScript_1BEF5A:: @ 81BEF5A
EventScript_GiveProfile: @ 81BEF5A
setvar VAR_0x8004, 0
call EventScript_1A6AC0
lock
faceplayer
compare VAR_0x8004, 0
goto_if_eq EventScript_1BEF3F
compare VAR_RESULT, 0
goto_if_eq EventScript_1BEE9E
compare VAR_RESULT, 1
goto_if_eq EventScript_1BEEA8
goto_if_eq EventScript_GaveSpecialProfile
compare VAR_RESULT, FALSE
goto_if_eq EventScript_CancelGiveProfile
compare VAR_RESULT, TRUE
goto_if_eq EventScript_GaveProfile
end
Text_1BEF88:: @ 81BEF88
Text_IdLoveToHearYourProfile: @ 81BEF88
.string "Hi, glad to meet you!\p"
.string "…That's unfriendly of you.\n"
.string "How about saying hi back?\p"
@@ -118,11 +120,11 @@ Text_1BEF88:: @ 81BEF88
.string "yourself.\p"
.string "I'd love to hear your profile!$"
Text_1BF017:: @ 81BF017
Text_TellMeWhatsYourProfile: @ 81BF017
.string "Tell me something good about\n"
.string "yourself. What's your profile?$"
gUnknown_81BF053:: @ 81BF053
Text_ExplainProfile: @ 81BF053
.string "A profile is written using four\n"
.string "words or phrases.\p"
.string "There're plenty of words to choose\n"
@@ -134,46 +136,46 @@ gUnknown_81BF053:: @ 81BF053
.string "…It's easier than it sounds.\n"
.string "Why don't you try it?$"
gUnknown_81BF166:: @ 81BF166
Text_WhatsYourProfile: @ 81BF166
.string "What's your profile?$"
gUnknown_81BF17B:: @ 81BF17B
Text_DontBeLikeThat: @ 81BF17B
.string "Aww… Don't be like that.\n"
.string "You can tell me your profile.$"
gUnknown_81BF1B2:: @ 81BF1B2
Text_DecidedNotTo: @ 81BF1B2
.string "Oh, you've decided not to?\n"
.string "You're fickle, aren't you?$"
gUnknown_81BF1E8:: @ 81BF1E8
Text_HiWeMeetAgain: @ 81BF1E8
.string "Hi!\n"
.string "We meet again!$"
Text_1BF1FB:: @ 81BF1FB
Text_ChangeYourProfile: @ 81BF1FB
.string "Would you like to change your\n"
.string "profile?$"
gUnknown_81BF222:: @ 81BF222
Text_WhatAreYouLikeNow: @ 81BF222
.string "What are you like now?\n"
.string "I'd really like to know.$"
gUnknown_81BF252:: @ 81BF252
Text_LikeProfileWayItIs: @ 81BF252
.string "Okay, you like your profile the\n"
.string "way it is.\p"
.string "I think so, too.$"
gUnknown_81BF28E:: @ 81BF28E
Text_ProfileSaysSomethingAboutYou: @ 81BF28E
.string "Hmhm…\p"
.string "Your profile really says something\n"
.string "about who you are.\p"
.string "Now that I know you better, it \n"
.string "makes us better friends than ever!$"
gUnknown_81BF30D:: @ 81BF30D
Text_HeardThatBefore: @ 81BF30D
.string "Oh, I've heard that before…\p"
.string "My cousin, who lives far away,\n"
.string "always used to say that, I think.$"
gUnknown_81BF36A:: @ 81BF36A
Text_TellMoreNextTime: @ 81BF36A
.string "Please tell me more about\n"
.string "yourself next time!$"
data/scripts/pc.inc
+12 -12
View File
@@ -31,9 +31,9 @@ EventScript_ChoosePCMenu:: @ 81A69A8
case 0, EventScript_AccessPokemonStorage
case 1, EventScript_AccessPlayersPC
case 2, EventScript_AccessProfOaksPC
case 3, EventScript_1A6A56
case 4, EventScript_1A6A46
case SCR_MENU_CANCEL, EventScript_1A6A46
case 3, EventScript_AccessHallOfFame
case 4, EventScript_TurnOffPC
case SCR_MENU_CANCEL, EventScript_TurnOffPC
end
EventScript_AccessPlayersPC:: @ 81A69F0
@@ -46,8 +46,8 @@ EventScript_AccessPlayersPC:: @ 81A69F0
EventScript_AccessPokemonStorage:: @ 81A6A05
playse SE_PC_LOGIN
call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A6A34
call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A6A3D
call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_AccessSomeonesPC
call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_AccessBillsPC
msgbox Text_OpenedPkmnStorage
special ShowPokemonStorageSystem
waitstate
@@ -56,15 +56,15 @@ EventScript_AccessPokemonStorage:: @ 81A6A05
goto EventScript_PCMainMenu
end
EventScript_1A6A34:: @ 81A6A34
EventScript_AccessSomeonesPC:: @ 81A6A34
msgbox Text_AccessedSomeonesPC
return
EventScript_1A6A3D:: @ 81A6A3D
EventScript_AccessBillsPC:: @ 81A6A3D
msgbox Text_AccessedBillsPC
return
EventScript_1A6A46:: @ 81A6A46
EventScript_TurnOffPC:: @ 81A6A46
setvar VAR_0x8004, 0
playse SE_PC_OFF
special Special_AnimatePcTurnOff
@@ -72,8 +72,8 @@ EventScript_1A6A46:: @ 81A6A46
releaseall
end
EventScript_1A6A56:: @ 81A6A56
goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_1A6A46
EventScript_AccessHallOfFame:: @ 81A6A56
goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC
playse SE_PC_LOGIN
setvar VAR_0x8004, 31
special HelpSystem_BackupSomeVariable
@@ -85,14 +85,14 @@ EventScript_1A6A56:: @ 81A6A56
end
EventScript_AccessProfOaksPC:: @ 81A6A7A
goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1A6A46
goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_TurnOffPC
playse SE_PC_LOGIN
msgbox Text_AccessedProfOaksPC
msgbox Text_HavePokedexRated, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_ExitOaksPC
setflag FLAG_OAKS_RATING_IS_VIA_PC
call EventScript_1A73E0
call ProfOak_EventScript_RatePokedex
clearflag FLAG_OAKS_RATING_IS_VIA_PC
goto EventScript_ExitOaksPC
end
data/scripts/pkmn_center_nurse.inc
+3 -3
View File
@@ -45,7 +45,7 @@ EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom:: @ 81A65EC
EventScript_PkmnCenterNurse_ReturnPkmn:: @ 81A661D
message Text_RestoredPkmnToFullHealth
waitmessage
applymovement VAR_LAST_TALKED, Movement_1A666C
applymovement VAR_LAST_TALKED, Movement_Bow
waitmovement 0
msgbox Text_WeHopeToSeeYouAgain
return
@@ -56,7 +56,7 @@ EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom:: @ 81A6636
setflag FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER
message Text_PlayerIsPlayingRightNowGoForIt
waitmessage
applymovement VAR_LAST_TALKED, Movement_1A666C
applymovement VAR_LAST_TALKED, Movement_Bow
waitmovement 0
msgbox Text_WeHopeToSeeYouAgain
return
@@ -65,7 +65,7 @@ EventScript_PkmnCenterNurse_Goodbye:: @ 81A6663
msgbox Text_WeHopeToSeeYouAgain
return
Movement_1A666C:: @ 81A666C
Movement_Bow:: @ 81A666C
nurse_joy_bow
delay_4
step_end
data/scripts/pokedex_rating.inc
+38 -38
View File
@@ -1,42 +1,42 @@
EventScript_1A737B:: @ 81A737B
ProfOak_EventScript_RatePokedexInPerson:: @ 81A737B
special sub_8110AB4
compare VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
special sub_8112364
call_if_set FLAG_OAK_SAW_DEX_COMPLETION, EventScript_1A73A4
call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, EventScript_1A73AD
call EventScript_1A73E0
call_if_set FLAG_OAK_SAW_DEX_COMPLETION, ProfOak_EventScript_DexCompleteIntro
call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, ProfOak_EventScript_NormalIntro
call ProfOak_EventScript_RatePokedex
return
EventScript_1A73A4:: @ 81A73A4
msgbox Text_1A72F2
ProfOak_EventScript_DexCompleteIntro:: @ 81A73A4
msgbox Text_LoveSeeingYourPokedex
return
EventScript_1A73AD:: @ 81A73AD
msgbox gUnknown_81A6C51
ProfOak_EventScript_NormalIntro:: @ 81A73AD
msgbox Text_HowIsPokedexComingAlong
return
EventScript_1A73B6:: @ 81A73B6
ProfOak_EventScript_ShowRatingMsg:: @ 81A73B6
copyvar VAR_0x8004, VAR_0x8009
special Special_GetProfOaksRatingMessage
waitmessage
compare VAR_RESULT, 0
call_if_eq EventScript_1A73D8
compare VAR_RESULT, 1
call_if_eq EventScript_1A73DC
compare VAR_RESULT, FALSE
call_if_eq ProfOak_EventScript_RatingFanfare
compare VAR_RESULT, TRUE
call_if_eq ProfOak_EventScript_DexCompleteFanfare
waitfanfare
waitbuttonpress
return
EventScript_1A73D8:: @ 81A73D8
ProfOak_EventScript_RatingFanfare:: @ 81A73D8
playfanfare MUS_FAN2
return
EventScript_1A73DC:: @ 81A73DC
ProfOak_EventScript_DexCompleteFanfare:: @ 81A73DC
playfanfare MUS_FANFA5
return
EventScript_1A73E0:: @ 81A73E0
ProfOak_EventScript_RatePokedex:: @ 81A73E0
setvar VAR_0x8004, 31
special HelpSystem_BackupSomeVariable
special Special_SetSomeVariable
@@ -45,42 +45,42 @@ EventScript_1A73E0:: @ 81A73E0
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
copyvar VAR_0x800A, VAR_RESULT
getnumberstring 0, VAR_0x8008
getnumberstring 1, VAR_0x8009
msgbox Text_1A6CA3
call_if_unset FLAG_OAKS_RATING_IS_VIA_PC, EventScript_1A746D
call EventScript_1A73B6
compare VAR_0x800A, 0
goto_if_eq EventScript_1A748F
getnumberstring 0, VAR_0x8008 @ Num Kanto Seen
getnumberstring 1, VAR_0x8009 @ Num Kanto Caught
msgbox Text_YouveSeenXAndOwnedYMons
call_if_unset FLAG_OAKS_RATING_IS_VIA_PC, ProfOak_EventScript_SetTextColor
call ProfOak_EventScript_ShowRatingMsg
compare VAR_0x800A, FALSE
goto_if_eq ProfOak_EventScript_EndRatePokedex @ National Dex not enabled
setvar VAR_0x8004, 1
specialvar VAR_RESULT, Special_GetPokedexCount
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
getnumberstring 0, VAR_0x8008
getnumberstring 1, VAR_0x8009
msgbox Text_1A71AA
getnumberstring 0, VAR_0x8008 @ Num National Seen
getnumberstring 1, VAR_0x8009 @ Num National Caught
msgbox Text_AndNationalDexSeenXOwnedY
specialvar VAR_RESULT, HasAllMons
compare VAR_RESULT, 0
goto_if_eq EventScript_1A7470
compare VAR_RESULT, 1
goto_if_eq EventScript_1A747E
compare VAR_RESULT, FALSE
goto_if_eq ProfOak_EventScript_DexIncomplete
compare VAR_RESULT, TRUE
goto_if_eq ProfOak_EventScript_DexComplete
end
EventScript_1A746D:: @ 81A746D
ProfOak_EventScript_SetTextColor:: @ 81A746D
textcolor 0
return
EventScript_1A7470:: @ 81A7470
msgbox Text_1A71EE
goto EventScript_1A748F
ProfOak_EventScript_DexIncomplete:: @ 81A7470
msgbox Text_LookForwardToFilledNationalDex
goto ProfOak_EventScript_EndRatePokedex
end
EventScript_1A747E:: @ 81A747E
ProfOak_EventScript_DexComplete:: @ 81A747E
setflag FLAG_OAK_SAW_DEX_COMPLETION
msgbox Text_1A722F
goto EventScript_1A748F
msgbox Text_YouveCompletedDex
goto ProfOak_EventScript_EndRatePokedex
end
EventScript_1A748F:: @ 81A748F
ProfOak_EventScript_EndRatePokedex:: @ 81A748F
special HelpSystem_RestoreSomeVariable
return
data/scripts/pokemon_mansion.inc
+207
View File
@@ -0,0 +1,207 @@
EventScript_1A7AE2:: @ 81A7AE2
msgbox Text_177460, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1A7B70
msgbox Text_17747B
goto_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7B3B
setflag FLAG_POKEMON_MANSION_SWITCH_STATE
switch VAR_0x8004
case 0, EventScript_1A7B7A
case 1, EventScript_1A7D3E
case 2, EventScript_1A7E72
case 3, EventScript_1A7F4C
end
EventScript_1A7B3B:: @ 81A7B3B
clearflag FLAG_POKEMON_MANSION_SWITCH_STATE
switch VAR_0x8004
case 0, EventScript_1A7C5C
case 1, EventScript_1A7DD8
case 2, EventScript_1A7EDF
case 3, EventScript_1A8025
end
EventScript_1A7B70:: @ 81A7B70
msgbox Text_177489
releaseall
end
EventScript_1A7B7A:: @ 81A7B7A
setmetatile 22, 10, 645, 0
setmetatile 23, 10, 644, 0
setmetatile 24, 10, 644, 0
setmetatile 22, 11, 645, 0
setmetatile 23, 11, 644, 0
setmetatile 24, 11, 644, 0
setmetatile 27, 25, 645, 0
setmetatile 28, 25, 644, 0
setmetatile 29, 25, 644, 0
setmetatile 27, 26, 645, 0
setmetatile 28, 26, 644, 0
setmetatile 29, 26, 644, 0
setmetatile 32, 25, 645, 0
setmetatile 33, 25, 644, 0
setmetatile 34, 25, 644, 0
setmetatile 32, 26, 645, 0
setmetatile 33, 26, 644, 0
setmetatile 34, 26, 644, 0
setmetatile 31, 18, 760, 1
setmetatile 32, 18, 761, 1
setmetatile 33, 18, 762, 1
setmetatile 31, 19, 768, 1
setmetatile 32, 19, 769, 1
setmetatile 33, 19, 770, 1
setmetatile 5, 4, 845, 0
return
EventScript_1A7C5C:: @ 81A7C5C
setmetatile 22, 10, 760, 1
setmetatile 23, 10, 761, 1
setmetatile 24, 10, 762, 1
setmetatile 22, 11, 768, 1
setmetatile 23, 11, 769, 1
setmetatile 24, 11, 770, 1
setmetatile 27, 25, 760, 1
setmetatile 28, 25, 761, 1
setmetatile 29, 25, 762, 1
setmetatile 27, 26, 768, 1
setmetatile 28, 26, 769, 1
setmetatile 29, 26, 770, 1
setmetatile 32, 25, 760, 1
setmetatile 33, 25, 761, 1
setmetatile 34, 25, 762, 1
setmetatile 32, 26, 768, 1
setmetatile 33, 26, 769, 1
setmetatile 34, 26, 770, 1
setmetatile 31, 18, 645, 0
setmetatile 32, 18, 644, 0
setmetatile 33, 18, 644, 0
setmetatile 31, 19, 645, 0
setmetatile 32, 19, 644, 0
setmetatile 33, 19, 644, 0
setmetatile 5, 4, 788, 0
return
EventScript_1A7D3E:: @ 81A7D3E
setmetatile 24, 14, 645, 0
setmetatile 25, 14, 644, 0
setmetatile 26, 14, 644, 0
setmetatile 24, 15, 645, 0
setmetatile 25, 15, 644, 0
setmetatile 26, 15, 644, 0
setmetatile 10, 28, 677, 1
setmetatile 10, 29, 685, 1
setmetatile 10, 30, 645, 0
setmetatile 10, 31, 644, 0
setmetatile 10, 32, 693, 0
setmetatile 12, 4, 848, 1
setmetatile 12, 5, 856, 1
setmetatile 12, 6, 864, 1
setmetatile 12, 7, 872, 1
setmetatile 12, 8, 880, 1
setmetatile 2, 15, 845, 0
return
EventScript_1A7DD8:: @ 81A7DD8
setmetatile 24, 14, 760, 1
setmetatile 25, 14, 761, 1
setmetatile 26, 14, 762, 1
setmetatile 24, 15, 768, 1
setmetatile 25, 15, 769, 1
setmetatile 26, 15, 770, 1
setmetatile 10, 28, 848, 1
setmetatile 10, 29, 856, 1
setmetatile 10, 30, 864, 1
setmetatile 10, 31, 872, 1
setmetatile 10, 32, 880, 1
setmetatile 12, 4, 677, 1
setmetatile 12, 5, 685, 1
setmetatile 12, 6, 645, 0
setmetatile 12, 7, 644, 0
setmetatile 12, 8, 693, 0
setmetatile 2, 15, 788, 0
return
EventScript_1A7E72:: @ 81A7E72
setmetatile 17, 11, 645, 0
setmetatile 18, 11, 644, 0
setmetatile 19, 11, 644, 0
setmetatile 17, 12, 645, 0
setmetatile 18, 12, 644, 0
setmetatile 19, 12, 644, 0
setmetatile 21, 4, 848, 1
setmetatile 21, 5, 856, 1
setmetatile 21, 6, 864, 1
setmetatile 21, 7, 872, 1
setmetatile 21, 8, 880, 1
setmetatile 12, 4, 845, 0
return
EventScript_1A7EDF:: @ 81A7EDF
setmetatile 17, 11, 760, 1
setmetatile 18, 11, 761, 1
setmetatile 19, 11, 762, 1
setmetatile 17, 12, 768, 1
setmetatile 18, 12, 769, 1
setmetatile 19, 12, 770, 1
setmetatile 21, 4, 677, 1
setmetatile 21, 5, 685, 1
setmetatile 21, 6, 645, 0
setmetatile 21, 7, 644, 0
setmetatile 21, 8, 693, 0
setmetatile 12, 4, 788, 0
return
EventScript_1A7F4C:: @ 81A7F4C
setmetatile 33, 20, 760, 1
setmetatile 34, 20, 761, 1
setmetatile 35, 20, 762, 1
setmetatile 33, 21, 852, 1
setmetatile 34, 21, 853, 1
setmetatile 35, 21, 854, 1
setmetatile 16, 26, 848, 1
setmetatile 16, 27, 856, 1
setmetatile 16, 28, 866, 1
setmetatile 16, 29, 874, 1
setmetatile 16, 30, 882, 1
setmetatile 12, 8, 677, 1
setmetatile 12, 9, 685, 1
setmetatile 12, 10, 647, 0
setmetatile 12, 11, 646, 0
setmetatile 12, 12, 688, 0
setmetatile 20, 22, 647, 0
setmetatile 21, 22, 646, 0
setmetatile 22, 22, 646, 0
setmetatile 20, 23, 647, 0
setmetatile 21, 23, 646, 0
setmetatile 22, 23, 646, 0
setmetatile 24, 28, 847, 0
setmetatile 27, 4, 847, 0
return
EventScript_1A8025:: @ 81A8025
setmetatile 33, 20, 647, 0
setmetatile 34, 20, 646, 0
setmetatile 35, 20, 646, 0
setmetatile 33, 21, 647, 0
setmetatile 34, 21, 646, 0
setmetatile 35, 21, 646, 0
setmetatile 16, 26, 677, 1
setmetatile 16, 27, 685, 1
setmetatile 16, 28, 647, 0
setmetatile 16, 29, 646, 0
setmetatile 16, 30, 688, 0
setmetatile 12, 8, 848, 1
setmetatile 12, 9, 856, 1
setmetatile 12, 10, 866, 1
setmetatile 12, 11, 874, 1
setmetatile 12, 12, 882, 1
setmetatile 20, 22, 760, 1
setmetatile 21, 22, 761, 1
setmetatile 22, 22, 762, 1
setmetatile 20, 23, 852, 1
setmetatile 21, 23, 853, 1
setmetatile 22, 23, 854, 1
setmetatile 24, 28, 790, 0
setmetatile 27, 4, 790, 0
return
data/scripts/repel.inc
+2 -2
View File
@@ -1,6 +1,6 @@
EventScript_RepelWoreOff:: @ 81BFB65
msgbox Text_1BFB6E, MSGBOX_SIGN
msgbox Text_RepelWoreOff, MSGBOX_SIGN
end
Text_1BFB6E:: @ 81BFB6E
Text_RepelWoreOff:: @ 81BFB6E
.string "REPEL's effect wore off…$"
data/scripts/static_pokemon.inc
+6 -6
View File
@@ -1,23 +1,23 @@
EventScript_1A922D:: @ 81A922D
EventScript_RemoveStaticMon:: @ 81A922D
fadescreen FADE_TO_BLACK
removeobject VAR_LAST_TALKED
fadescreen FADE_FROM_BLACK
release
end
EventScript_1A9236:: @ 81A9236
EventScript_MonFlewAway:: @ 81A9236
fadescreen FADE_TO_BLACK
removeobject VAR_LAST_TALKED
fadescreen FADE_FROM_BLACK
getspeciesname 0, VAR_0x8004
msgbox Text_1A63C4
msgbox Text_MonFlewAway
release
end
EventScript_1A924B:: @ 81A924B
message Text_1853E8
EventScript_AwakenSnorlax:: @ 81A924B
message Text_PlayedPokeFlute
waitmessage
playfanfare MUS_POKEFUE
waitfanfare
msgbox Text_185354
msgbox Text_SnorlaxWokeUp
return
data/scripts/std_msgbox.inc
+7 -7
View File
@@ -30,34 +30,34 @@ Std_MsgboxYesNo:: @ 81A4E5C
Std_ReceivedItem:: @ 81A4E66
textcolor 3
compare VAR_0x8002, MUS_FANFA1
call_if_eq EventScript_1A4EA2
call_if_eq EventScript_ReceivedItemFanfare1
compare VAR_0x8002, MUS_FAN5
call_if_eq EventScript_1A4EA6
call_if_eq EventScript_ReceivedItemFanfare2
message 0x0
waitmessage
waitfanfare
compare VAR_0x8002, MUS_FANFA1
call_if_eq EventScript_1A4EAA
call_if_eq EventScript_ReceivedItemWaitFanfare
putitemaway VAR_0x8000, VAR_0x8001
call EventScript_1A6675
return
EventScript_1A4EA2:: @ 81A4EA2
EventScript_ReceivedItemFanfare1:: @ 81A4EA2
playfanfare MUS_FANFA1
return
EventScript_1A4EA6:: @ 81A4EA6
EventScript_ReceivedItemFanfare2:: @ 81A4EA6
playfanfare MUS_FAN5
return
EventScript_1A4EAA:: @ 81A4EAA
EventScript_ReceivedItemWaitFanfare:: @ 81A4EAA
delay 50
return
EventScript_UnusedReturn:: @ 81A4EAE
return
EventScript_1A4EAF:: @ 81A4EAF
EventScript_AskSaveGame:: @ 81A4EAF
special Field_AskSaveTheGame
waitstate
return
data/scripts/surf.inc
+3 -3
View File
@@ -8,17 +8,17 @@ EventScript_UseSurf:: @ 81A6AC8
getpartymonname 0, VAR_RESULT
setfieldeffectarg 0, VAR_RESULT
lockall
msgbox Text_1A556E, MSGBOX_YESNO
msgbox Text_WantToSurf, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_UseSurfRelease
msgbox Text_1A55A5
msgbox Text_UsedSurf
dofieldeffect FLDEFF_USE_SURF
EventScript_UseSurfRelease:@ 81A6B0B
releaseall
EventScript_UseSurfEnd: @ 81A6B0C
end
gUnknown_81A6B0D:: @ 81A6B0D
EventScript_CurrentTooFast:: @ 81A6B0D
lockall
msgbox Text_CurrentTooFast
releaseall
data/text/poke_mart.inc
+4 -4
View File
@@ -6,13 +6,13 @@ Text_FillOutQuestionnaire:: @ 81A622C
.string "There is a questionnaire.\n"
.string "Would you like to fill it out?$"
Text_1A6265:: @ 81A6265
Text_QuestionnaireThankYou:: @ 81A6265
.string "Thank you for taking the time to\n"
.string "fill out our questionnaire.\p"
.string "Your feedback will be used for\n"
.string "future reference.$"
Text_1A62D3:: @ 81A62D3
Text_YouKnowThoseWords:: @ 81A62D3
.string "Oh, hello!\n"
.string "You know those words?\p"
.string "That means you must know about\n"
@@ -20,10 +20,10 @@ Text_1A62D3:: @ 81A62D3
.string "From now on, you should be\n"
.string "receiving MYSTERY GIFTS!$"
Text_1A6359:: @ 81A6359
Text_YouCanAccessMysteryGift:: @ 81A6359
.string "Once you save your game, you can\n"
.string "access the MYSTERY GIFT.$"
Text_1A6393:: @ 81A6393
Text_ThankYouForAccessingMysteryGift:: @ 81A6393
.string "Thank you for accessing the\n"
.string "MYSTERY GIFT System.$"
data/text/pokedex_rating.inc
+6 -6
View File
@@ -1,9 +1,9 @@
gUnknown_81A6C51:: @ 81A6C51
Text_HowIsPokedexComingAlong:: @ 81A6C51
.string "OAK: Good to see you!\n"
.string "How is your POKéDEX coming along?\p"
.string "Here, let me take a look.$"
Text_1A6CA3:: @ 81A6CA3
Text_YouveSeenXAndOwnedYMons:: @ 81A6CA3
.string "The amount of progress you've made\n"
.string "on your POKéDEX is:\p"
.string "{STR_VAR_1} POKéMON seen and\n"
@@ -86,16 +86,16 @@ gUnknown_81A7175:: @ 81A7175
.string "Your POKéDEX is entirely complete!\n"
.string "Congratulations!!$"
Text_1A71AA:: @ 81A71AA
Text_AndNationalDexSeenXOwnedY:: @ 81A71AA
.string "And your NATIONAL POKéDEX is:\p"
.string "{STR_VAR_1} POKéMON seen and\n"
.string "{STR_VAR_2} POKéMON owned.$"
Text_1A71EE:: @ 81A71EE
Text_LookForwardToFilledNationalDex:: @ 81A71EE
.string "I'll be looking forward to seeing\n"
.string "you fill the NATIONAL POKéDEX!$"
Text_1A722F:: @ 81A722F
Text_YouveCompletedDex:: @ 81A722F
.string "Finally…\p"
.string "You've finally completed the\n"
.string "POKéDEX!\p"
@@ -113,7 +113,7 @@ gUnknown_81A72AD:: @ 81A72AD
.string "Sincerely, thank you!\l"
.string "You've made my dream a reality!$"
Text_1A72F2:: @ 81A72F2
Text_LoveSeeingYourPokedex:: @ 81A72F2
.string "OAK: Ah, welcome!\p"
.string "Tell me, how is your POKéDEX\n"
.string "coming along?\p"
data/text/save.inc
+1 -1
View File
@@ -12,7 +12,7 @@ gText_SavingDontTurnOffThePower:: @ 81C5625
gText_PlayerSavedTheGame:: @ 81C5647
.string "{PLAYER} saved the game.$"
gUnknown_81C565A::
gText_SaveFailed::
.string "セーブに　しっぱい　しました‥$"
gText_DifferentGameFile:: @ 81C566A
data/text/surf.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Text_1A556E:: @ 81A556E
Text_WantToSurf:: @ 81A556E
.string "The water is dyed a deep blue…\n"
.string "Would you like to SURF?$"
Text_1A55A5:: @ 81A55A5
Text_UsedSurf:: @ 81A55A5
.string "{STR_VAR_1} used SURF!$"
Text_CurrentTooFast:: @ 81A55B3
include/constants/flags.h
+1 -1
View File
@@ -722,7 +722,7 @@
#define FLAG_TUTOR_THUNDER_WAVE 0x2C1
#define FLAG_TUTOR_ROCK_SLIDE 0x2C2
#define FLAG_TUTOR_EXPLOSION 0x2C3
#define FLAG_TUTOR_META_PUNCH 0x2C4
#define FLAG_TUTOR_MEGA_PUNCH 0x2C4
#define FLAG_TUTOR_MEGA_KICK 0x2C5
#define FLAG_TUTOR_DREAM_EATER 0x2C6
#define FLAG_TUTOR_SOFT_BOILED 0x2C7
include/constants/vars.h
+2 -2
View File
@@ -52,7 +52,7 @@
#define VAR_FRIENDSHIP_STEP_COUNT 0x4021
// Maybe unused?
#define VAR_ICE_STEP_COUNT 0x4022
#define VAR_0x4022 0x4022
// Step counter. Caps at 1500. If you enter a map with
// renewable hidden items and this counter is capped,
@@ -89,7 +89,7 @@
#define VAR_0x402F 0x402F
#define VAR_0x4030 0x4030
#define VAR_ICE_STEP_COUNT 0x4030
#define VAR_STARTER_MON 0x4031
#define VAR_0x4032 0x4032
#define VAR_ENIGMA_BERRY_AVAILABLE 0x4033
src/event_data.c
+1 -1
View File
@@ -213,7 +213,7 @@ static bool8 IsFlagOrVarStoredInQuestLog(u16 idx, bool8 isVar)
}
else
{
if (idx < VAR_0x4030 - VARS_START)
if (idx < VAR_ICE_STEP_COUNT - VARS_START)
return FALSE;
if (idx >= VAR_MAP_SCENE_PALLET_TOWN_OAK - VARS_START && idx < VAR_PORTHOLE - VARS_START)
return FALSE;
src/field_tasks.c
+1 -1
View File
@@ -268,7 +268,7 @@ static void CrackedFloorPerStepCallback(u8 taskId)
if (MetatileBehavior_ReturnFalse_13(behavior))
{
if (GetPlayerSpeed() != 4)
VarSet(VAR_0x4030, 0);
VarSet(VAR_ICE_STEP_COUNT, 0);
if (data[4] == 0)
{