diff options
Diffstat (limited to 'data')
67 files changed, 244 insertions, 2214 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 0336c0c97..f28707fbb 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -5,6 +5,7 @@ #include "constants/songs.h" #include "constants/species.h" #include "constants/vars.h" +#include "constants/heal_locations.h" #include "constants/trainers.h" .include "asm/macros.inc" .include "asm/macros/event.inc" @@ -1110,10 +1111,10 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_0x2DE setflag FLAG_0x351 setflag FLAG_0x32F - setflag FLAG_0x315 - setflag FLAG_0x316 - setflag FLAG_0x317 - setflag FLAG_0x318 + setflag FLAG_HIDE_FANCLUB_OLD_LADY + setflag FLAG_HIDE_FANCLUB_BOY + setflag FLAG_HIDE_FANCLUB_LITTLE_BOY + setflag FLAG_HIDE_FANCLUB_LADY setflag FLAG_0x2DA setflag FLAG_0x31D setflag FLAG_0x31E @@ -2356,8 +2357,8 @@ RusturfTunnel_EventScript_272216:: @ 8272216 removeobject 10 clearflag FLAG_0x328 clearflag FLAG_0x3D8 - setvar VAR_0x409A, 6 - setflag FLAG_0x0C7 + setvar VAR_RUSTURF_TUNNEL_STATE, 6 + setflag FLAG_RUSTURF_TUNNEL_OPENED return EventScript_27222B:: @ 827222B @@ -2517,7 +2518,7 @@ Route119_EventScript_272365:: @ 8272365 setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq Route119_EventScript_2723C1 compare VAR_RESULT, 4 @@ -3346,7 +3347,7 @@ EventScript_2736D9:: @ 82736D9 end EventScript_2736F4:: @ 82736F4 - setrespawn 16 + setrespawn HEAL_LOCATION_LAVARIDGE_TOWN return EventScript_2736F8:: @ 82736F8 diff --git a/data/field_specials.s b/data/field_specials.s deleted file mode 100644 index 8f9734a01..000000000 --- a/data/field_specials.s +++ /dev/null @@ -1,547 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_085B2B5C:: @ 85B2B5C - .byte 0x07, 0x09, 0x08, 0x0a - - .align 2 -gUnknown_085B2B60:: @ 85B2B60 - .byte 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x00 - -gUnknown_085B2B68:: @ 85B2B68 - .byte 0x07, 0x16, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0a, 0x10, 0x00, 0x00, 0x0f, 0x10, 0x00, 0x00 - -gUnknown_085B2B78:: @ 85B2B78 - .byte 0x00, 0x01, 0x01, 0x01, 0x01, 0x00 - - .align 1 -gUnknown_085B2B7E:: @ 85B2B7E - .2byte 0x0218, 0x0219, 0x021a, 0x021b, 0x021c - -gUnknown_085B2B88:: @ 85B2B88 - .byte 0x0c, 0x02, 0x04, 0x05, 0x01, 0x08, 0x07, 0x0b, 0x03, 0x0a, 0x09, 0x06 - -gUnknown_085B2B94:: @ 85B2B94 - .byte 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x04, 0x04, 0x05 - -gUnknown_085B2BA0:: @ 85B2BA0 - .byte 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05 - - .align 2 -gUnknown_085B2BAC:: @ 85B2BAC - .byte 0x00, 0x15, 0x01, 0x08, 0x04, 0x0f, 0x08, 0x00 - - .align 2 -gElevatorFloorsTable:: @ 85B2BB4 - .4byte gText_B4F - .4byte gText_B3F - .4byte gText_B2F - .4byte gText_B1F - .4byte gText_1F - .4byte gText_2F - .4byte gText_3F - .4byte gText_4F - .4byte gText_5F - .4byte gText_6F - .4byte gText_7F - .4byte gText_8F - .4byte gText_9F - .4byte gText_10F - .4byte gText_11F - .4byte gText_Rooftop - - .align 1 -gUnknown_085B2BF4:: @ 85B2BF4 - .2byte 0x0329, 0x032a, 0x032b, 0x0331, 0x0332, 0x0333, 0x0339, 0x033a, 0x033b - - .align 1 -gUnknown_085B2C06:: @ 85B2C06 - .2byte 0x0329, 0x032b, 0x032a, 0x0331, 0x0333, 0x0332, 0x0339, 0x033b, 0x033a - -gUnknown_085B2C18:: @ 85B2C18 - .byte 0x08, 0x10, 0x18, 0x20, 0x26, 0x2e, 0x34, 0x38, 0x39 - -gUnknown_085B2C21:: @ 85B2C21 - .byte 0x03, 0x06, 0x09, 0x0c, 0x0f, 0x12, 0x15, 0x18, 0x1b - - .align 1 -gUnknown_085B2C2A:: @ 85B2C2A - .2byte 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a - .2byte 0x1a35, 0x193c, 0xffff - - .align 2 -gUnknown_085B2C50:: @ 85B2C50 - .4byte BattleFrontier_Lounge2_Text_260971 - .4byte BattleFrontier_Lounge2_Text_260A1E - .4byte BattleFrontier_Lounge2_Text_260AE7 - .4byte BattleFrontier_Lounge2_Text_2619AC - .4byte BattleFrontier_Lounge2_Text_261A91 - .4byte BattleFrontier_Lounge2_Text_261B0C - .4byte BattleFrontier_Lounge2_Text_261B95 - .4byte BattleFrontier_Lounge2_Text_261B95 - .4byte BattleFrontier_Lounge2_Text_261B95 - .4byte BattleFrontier_Lounge2_Text_261C1A - .4byte BattleFrontier_Lounge2_Text_261C1A - .4byte BattleFrontier_Lounge2_Text_261C1A - .4byte BattleFrontier_Lounge2_Text_260BC4 - .4byte BattleFrontier_Lounge2_Text_260C6D - .4byte BattleFrontier_Lounge2_Text_260D3A - .4byte BattleFrontier_Lounge2_Text_260E1E - .4byte BattleFrontier_Lounge2_Text_260EC7 - .4byte BattleFrontier_Lounge2_Text_260F74 - .4byte BattleFrontier_Lounge2_Text_2614E6 - .4byte BattleFrontier_Lounge2_Text_261591 - .4byte BattleFrontier_Lounge2_Text_26166F - .4byte BattleFrontier_Lounge2_Text_261282 - .4byte BattleFrontier_Lounge2_Text_261329 - .4byte BattleFrontier_Lounge2_Text_261403 - .4byte BattleFrontier_Lounge2_Text_261026 - .4byte BattleFrontier_Lounge2_Text_2610CC - .4byte BattleFrontier_Lounge2_Text_261194 - .4byte BattleFrontier_Lounge2_Text_26174D - .4byte BattleFrontier_Lounge2_Text_2617F9 - .4byte BattleFrontier_Lounge2_Text_2618C4 - -gUnknown_085B2CC8:: @ 85B2CC8 - .byte 0x15, 0x38, 0x15, 0x23, 0xff, 0xff, 0xff, 0xff, 0x02, 0x04, 0x07, 0x15, 0x07, 0x15, 0x0e, 0x1c, 0x0d, 0x70, 0x07, 0x38 - - .align 1 -gUnknown_085B2CDC:: @ 85B2CDC - .2byte 0x0007, 0x000e, 0x0015, 0x001c, 0x0023, 0x0031, 0x003f, 0x004d, 0x005b, 0x0000 - - .align 2 -gUnknown_085B2CF0:: @ 85B2CF0 - .4byte gText_Exit - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - - .4byte gText_BlueFlute - .4byte gText_YellowFlute - .4byte gText_RedFlute - .4byte gText_WhiteFlute - .4byte gText_BlackFlute - .4byte gText_PrettyChair - .4byte gText_PrettyDesk - .4byte gText_Exit - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - - .4byte gText_0Pts - .4byte gText_10Pts - .4byte gText_20Pts - .4byte gText_30Pts - .4byte gText_40Pts - .4byte gText_50Pts - .4byte gText_60Pts - .4byte gText_70Pts - .4byte gText_80Pts - .4byte gText_90Pts - .4byte gText_100Pts - .4byte gText_QuestionMark - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - - .4byte gText_KissPoster16BP - .4byte gText_KissCushion32BP - .4byte gText_SmoochumDoll32BP - .4byte gText_TogepiDoll48BP - .4byte gText_MeowthDoll48BP - .4byte gText_ClefairyDoll48BP - .4byte gText_DittoDoll48BP - .4byte gText_CyndaquilDoll80BP - .4byte gText_ChikoritaDoll80BP - .4byte gText_TotodileDoll80BP - .4byte gText_Exit - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - - .4byte gText_LaprasDoll128BP - .4byte gText_SnorlaxDoll128BP - .4byte gText_VenusaurDoll256BP - .4byte gText_CharizardDoll256BP - .4byte gText_BlastoiseDoll256BP - .4byte gText_Exit - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - - .4byte gText_Protein1BP - .4byte gText_Calcium1BP - .4byte gText_Iron1BP - .4byte gText_Zinc1BP - .4byte gText_Carbos1BP - .4byte gText_HpUp1BP - .4byte gText_Exit - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - - .4byte gText_Leftovers48BP - .4byte gText_WhiteHerb48BP - .4byte gText_QuickClaw48BP - .4byte gText_MentalHerb48BP - .4byte gText_BrightPowder64BP - .4byte gText_ChoiceBand64BP - .4byte gText_KingsRock64BP - .4byte gText_FocusBand64BP - .4byte gText_ScopeLens64BP - .4byte gText_Exit - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - - .4byte gText_EnergyPowder50 - .4byte gText_EnergyRoot80 - .4byte gText_HealPowder50 - .4byte gText_RevivalHerb300 - .4byte gText_Protein1000 - .4byte gText_Iron1000 - .4byte gText_Carbos1000 - .4byte gText_Calcium1000 - .4byte gText_Zinc1000 - .4byte gText_HPUp1000 - .4byte gText_PPUp3000 - .4byte gText_Exit - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - - .4byte gText_BattleTower2 - .4byte gText_BattleDome - .4byte gText_BattlePalace - .4byte gText_BattleArena - .4byte gText_BattleFactory - .4byte gText_BattlePike - .4byte gText_BattlePyramid - .4byte gText_RankingHall - .4byte gText_ExchangeService - .4byte gText_Exit - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - - .4byte gText_Softboiled16BP - .4byte gText_SeismicToss24BP - .4byte gText_DreamEater24BP - .4byte gText_MegaPunch24BP - .4byte gText_MegaKick48BP - .4byte gText_BodySlam48BP - .4byte gText_RockSlide48BP - .4byte gText_Counter48BP - .4byte gText_ThunderWave48BP - .4byte gText_SwordsDance48BP - .4byte gText_Exit - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - - .4byte gText_DefenseCurl16BP - .4byte gText_Snore24BP - .4byte gText_MudSlap24BP - .4byte gText_Swift24BP - .4byte gText_IcyWind24BP - .4byte gText_Endure48BP - .4byte gText_PsychUp48BP - .4byte gText_IcePunch48BP - .4byte gText_ThunderPunch48BP - .4byte gText_FirePunch48BP - .4byte gText_Exit - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - - .4byte gText_SlateportCity - .4byte gText_BattleFrontier - .4byte gText_SouthernIsland - .4byte gText_NavelRock - .4byte gText_BirthIsland - .4byte gText_FarawayIsland - .4byte gText_Exit - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - - .4byte gText_BattleTrainers - .4byte gText_BattleBasics - .4byte gText_PokemonNature - .4byte gText_PokemonMoves - .4byte gText_Underpowered - .4byte gText_WhenInDanger - .4byte gText_Exit - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL - - .align 2 -gUnknown_085B3030:: @ 85B3030 - .4byte 0x03000002, 0x00000000, 0x07d00000, 0x00000064 - - .align 2 -gUnknown_085B3040:: @ 85B3040 - .4byte BattleFrontier_Lounge5_Text_26468D - .4byte BattleFrontier_Lounge5_Text_2646E5 - .4byte BattleFrontier_Lounge5_Text_264741 - .4byte BattleFrontier_Lounge5_Text_2647A4 - .4byte BattleFrontier_Lounge5_Text_2647FC - .4byte BattleFrontier_Lounge5_Text_264858 - .4byte BattleFrontier_Lounge5_Text_2648BE - .4byte BattleFrontier_Lounge5_Text_264916 - .4byte BattleFrontier_Lounge5_Text_264972 - .4byte BattleFrontier_Lounge5_Text_2649D5 - .4byte BattleFrontier_Lounge5_Text_264A3F - .4byte BattleFrontier_Lounge5_Text_264A9B - .4byte BattleFrontier_Lounge5_Text_264AF3 - .4byte BattleFrontier_Lounge5_Text_264B5D - .4byte BattleFrontier_Lounge5_Text_2648BE - .4byte BattleFrontier_Lounge5_Text_264BC3 - .4byte BattleFrontier_Lounge5_Text_264C36 - .4byte BattleFrontier_Lounge5_Text_2648BE - .4byte BattleFrontier_Lounge5_Text_264C95 - .4byte BattleFrontier_Lounge5_Text_264D01 - .4byte BattleFrontier_Lounge5_Text_264D6B - .4byte BattleFrontier_Lounge5_Text_264DD7 - .4byte BattleFrontier_Lounge5_Text_264E33 - .4byte BattleFrontier_Lounge5_Text_264E8F - .4byte BattleFrontier_Lounge5_Text_2648BE - - .align 2 -gUnknown_085B30A4:: @ 85B30A4 - .4byte BattleFrontier_Lounge3_Text_262261 - .4byte BattleFrontier_Lounge3_Text_26230D - .4byte BattleFrontier_Lounge3_Text_2623B9 - .4byte BattleFrontier_Lounge3_Text_262464 - .4byte BattleFrontier_Lounge3_Text_26250E - .4byte BattleFrontier_Lounge3_Text_2625B8 - .4byte BattleFrontier_Lounge3_Text_26266A - .4byte BattleFrontier_Lounge3_Text_26271C - .4byte BattleFrontier_Lounge3_Text_2627C9 - .4byte BattleFrontier_Lounge3_Text_262876 - .4byte BattleFrontier_Lounge3_Text_26291A - .4byte BattleFrontier_Lounge3_Text_2629BC - - .align 2 -gUnknown_085B30D4:: @ 85B30D4 - .4byte BattleFrontier_Lounge3_Text_262C04 - .4byte BattleFrontier_Lounge3_Text_262C90 - .4byte BattleFrontier_Lounge3_Text_262D1C - .4byte BattleFrontier_Lounge3_Text_262DA7 - .4byte BattleFrontier_Lounge3_Text_262E34 - .4byte BattleFrontier_Lounge3_Text_262EC1 - .4byte BattleFrontier_Lounge3_Text_262F56 - .4byte BattleFrontier_Lounge3_Text_262FEB - .4byte BattleFrontier_Lounge3_Text_263078 - .4byte BattleFrontier_Lounge3_Text_263105 - .4byte BattleFrontier_Lounge3_Text_26318C - .4byte BattleFrontier_Lounge3_Text_263211 - - .align 1 -gUnknown_085B3104:: @ 85B3104 - .2byte 0x0000, 0x0001, 0x0002, 0x0100, 0x0101, 0x0400, 0x0401, 0x0200, 0x0201, 0x0300, 0x0500, 0x0600 - - .align 2 -gUnknown_085B311C:: @ 85B311C - window_template 0x00, 0x01, 0x01, 0x06, 0x02, 0x0f, 0x0008 - - .align 2 -gUnknown_085B3124:: @ 85B3124 - window_template 0x00, 0x02, 0x09, 0x04, 0x04, 0x0f, 0x0014 - - .align 1 -gUnknown_085B312C:: @ 85B312C - .2byte 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, 0xffff - - .align 1 -gUnknown_085B3142:: @ 85B3142 - .2byte 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, 0xffff - - .align 1 -gUnknown_085B314E:: @ 85B314E - .2byte 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, 0xffff - - .align 1 -gUnknown_085B315C:: @ 85B315C - .2byte 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, 0xffff - - .align 2 -gUnknown_085B3170:: @ 85B3170 - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0 - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260201 - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260287 - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5 - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0 - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E - .4byte gText_Exit - - .align 2 -gUnknown_085B319C:: @ 85B319C - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C - .4byte gText_Exit - - .align 2 -gUnknown_085B31B4:: @ 85B31B4 - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260397 - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6 - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260436 - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C - .4byte gText_Exit - - .align 2 -gUnknown_085B31D0:: @ 85B31D0 - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8 - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260542 - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260575 - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8 - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2 - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260613 - .4byte gText_Exit - - .align 1 -gUnknown_085B31F8:: @ 85B31F8 - .2byte 0x0087, 0x0045, 0x008a, 0x0005, 0x0019, 0x0022, 0x009d, 0x0044, 0x0056, 0x000e - - .align 1 -gUnknown_085B320C:: @ 85B320C - .2byte 0x006f, 0x00ad, 0x00bd, 0x0081, 0x00c4, 0x00cb, 0x00f4, 0x0008, 0x0009, 0x0007 - - .align 2 -gUnknown_085B3220:: @ 85B3220 - window_template 0x00, 0x01, 0x07, 0x0c, 0x06, 0x0f, 0x001c - - .align 2 -gUnknown_085B3228:: @ 85B3228 - .4byte BattleFrontier_Lounge7_Text_265E30 - .4byte BattleFrontier_Lounge7_Text_265E5B - .4byte BattleFrontier_Lounge7_Text_265E8A - .4byte BattleFrontier_Lounge7_Text_265EC0 - .4byte BattleFrontier_Lounge7_Text_265EED - .4byte BattleFrontier_Lounge7_Text_265F1C - .4byte BattleFrontier_Lounge7_Text_265F47 - .4byte BattleFrontier_Lounge7_Text_265F77 - .4byte BattleFrontier_Lounge7_Text_265FAA - .4byte BattleFrontier_Lounge7_Text_265FDD - .4byte gText_Exit - - .align 2 -gUnknown_085B3254:: @ 85B3254 - .4byte BattleFrontier_Lounge7_Text_26600A - .4byte BattleFrontier_Lounge7_Text_26603E - .4byte BattleFrontier_Lounge7_Text_266070 - .4byte BattleFrontier_Lounge7_Text_2660A6 - .4byte BattleFrontier_Lounge7_Text_2660D0 - .4byte BattleFrontier_Lounge7_Text_2660FF - .4byte BattleFrontier_Lounge7_Text_26612D - .4byte BattleFrontier_Lounge7_Text_26615F - .4byte BattleFrontier_Lounge7_Text_266185 - .4byte BattleFrontier_Lounge7_Text_2661B5 - .4byte gText_Exit - - .align 2 -gUnknown_085B3280:: @ 85B3280 - .incbin "graphics/unknown/unknown_5B3280.gbapal" - -gUnknown_085B33E0:: @ 85B33E0 - .byte 0x0f, 0x0c, 0x0b, 0x0e, 0x0f, 0x08, 0x13, 0x0e, 0x0c, 0x0b, 0x12, 0x0b, 0x0f, 0x0e, 0x0b, 0x0e, 0x13, 0x0e, 0x0f, 0x0f, 0x0f, 0x0a - -gUnknown_085B33F6:: @ 85B33F6 - .byte 0x04, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x06, 0x03, 0x03 - -gUnknown_085B3400:: @ 85B3400 - .byte 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c - -gUnknown_085B3410:: @ 85B3410 - .byte 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c - -gUnknown_085B3420:: @ 85B3420 - .byte 0x02, 0x04, 0x01, 0x04, 0x04, 0x01, 0x05, 0x00, 0x01, 0x06, 0x03, 0x01, 0x08, 0x06, 0x01, 0x09, 0x0d, 0x01, 0x0a, 0x07, 0x01, 0x0b, 0x07, 0x01, 0x0c, 0x04, 0x01, 0x0e, 0x05, 0x01, 0x0f, 0x04 - .byte 0x01, 0x1a, 0x37, 0x01 - - .align 1 -gUnknown_085B3444:: @ 85B3444 - .2byte 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a - .2byte 0x1a35, 0x1918, 0x1919, 0x191a, 0x191b, 0xffff - -gUnknown_085B3470:: @ 85B3470 - .byte 0x02, 0x01, 0x02, 0x01 - -gUnknown_085B3474:: @ 85B3474 - .byte 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f - -gUnknown_085B347C:: @ 85B347C - .byte 0x08, 0x0d, 0x0e, 0x0b, 0x0a, 0x0c, 0x0f, 0x09 - diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index 701b79fbf..628c9cece 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -43,7 +43,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3 setfieldeffectargument 1, 10 setfieldeffectargument 2, 0 dofieldeffect 54 - specialvar VAR_RESULT, sub_81392F8 + specialvar VAR_RESULT, FoundAbandonedShipRoom4Key compare VAR_RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DD3 waitfieldeffect 54 @@ -54,7 +54,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0C:: @ 8238D0C end AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D - specialvar VAR_RESULT, sub_81392AC + specialvar VAR_RESULT, FoundAbandonedShipRoom1Key compare VAR_RESULT, 1 goto_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32 delay 20 @@ -77,7 +77,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33 setfieldeffectargument 1, 3 setfieldeffectargument 2, 0 dofieldeffect 54 - specialvar VAR_RESULT, sub_8139320 + specialvar VAR_RESULT, FoundAbandonedShipRoom6Key compare VAR_RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DE3 waitfieldeffect 54 @@ -98,7 +98,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B setfieldeffectargument 1, 6 setfieldeffectargument 2, 0 dofieldeffect 54 - specialvar VAR_RESULT, sub_81392D4 + specialvar VAR_RESULT, FoundAbandonedShipRoom2Key compare VAR_RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DC3 waitfieldeffect 54 diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 3cd0b9eff..9dbacfe8e 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -10,7 +10,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3 end AncientTomb_EventScript_238FCD:: @ 8238FCD - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 goto_if 5, AncientTomb_EventScript_27374E removeobject VAR_LAST_TALKED @@ -75,7 +75,7 @@ AncientTomb_EventScript_23905A:: @ 823905A special StartRegiBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq AncientTomb_EventScript_2390A1 compare VAR_RESULT, 4 diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index cf59bdacc..12c25faac 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -9,7 +9,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 end AquaHideout_B1F_EventScript_2339BC:: @ 82339BC - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 goto_if 5, AquaHideout_B1F_EventScript_27374E removeobject VAR_LAST_TALKED @@ -41,7 +41,7 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq AquaHideout_B1F_EventScript_233A2F compare VAR_RESULT, 4 @@ -68,7 +68,7 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38 setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq AquaHideout_B1F_EventScript_233A7C compare VAR_RESULT, 4 diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc index 248c1f9ca..072d27137 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc @@ -14,7 +14,7 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0 waitmovement 0 special sub_813A080 waitse - special sub_8139A78 + special ShakeScreenInElevator waitstate delay 48 applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index dff56322a..0a3723acc 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F end BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 goto_if 5, BattleFrontier_OutsideEast_EventScript_27374E removeobject VAR_LAST_TALKED @@ -134,7 +134,7 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq BattleFrontier_OutsideEast_EventScript_242D60 compare VAR_RESULT, 4 diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc index 23818d64c..3dff67a93 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9 .byte 0 BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904 - setrespawn 22 + setrespawn HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST end BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908 diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index b2427e95d..787230c60 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -37,7 +37,7 @@ BirthIsland_Exterior_MapScript1_267F65: @ 8267F65 end BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 goto_if 5, BirthIsland_Exterior_EventScript_27374E removeobject 2 @@ -91,7 +91,7 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq BirthIsland_Exterior_EventScript_26803B compare VAR_RESULT, 4 diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 9137902f2..45d192c80 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -10,7 +10,7 @@ DesertRuins_MapScript1_22D96B: @ 822D96B end DesertRuins_EventScript_22D975:: @ 822D975 - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 goto_if 5, DesertRuins_EventScript_27374E removeobject VAR_LAST_TALKED @@ -75,7 +75,7 @@ DesertRuins_EventScript_22DA02:: @ 822DA02 special StartRegiBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq DesertRuins_EventScript_22DA49 compare VAR_RESULT, 4 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index 15a1c81b9..a9ce59bc1 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523 .byte 0 DewfordTown_PokemonCenter_1F_MapScript1_1FC52E: @ 81FC52E - setrespawn 15 + setrespawn HEAL_LOCATION_DEWFORD_TOWN call DewfordTown_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 60f0dd1ad..763d2ebb1 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -51,7 +51,7 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 end EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9 - setrespawn 1 + setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F fadescreenspeed 1, 24 special GameClear waitstate @@ -59,7 +59,7 @@ EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9 end EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5 - setrespawn 2 + setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F fadescreenspeed 1, 24 special GameClear waitstate diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index ed6e6a497..16b82a592 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34 .byte 0 EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F - setrespawn 11 + setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1 checkflag FLAG_0x1CF call_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C end diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index f1a6ce17f..b4046d022 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -4,7 +4,7 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2 .byte 0 EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD - setrespawn 20 + setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2 setflag FLAG_LANDMARK_POKEMON_LEAGUE checkflag FLAG_0x107 call_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index 15f5d2b9e..d11caa86f 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD .byte 0 FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8 - setrespawn 17 + setrespawn HEAL_LOCATION_FALLARBOR_TOWN call FallarborTown_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index e7d67431d..70e41b42d 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -11,7 +11,7 @@ FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F end FarawayIsland_Interior_EventScript_267D19:: @ 8267D19 - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq FarawayIsland_Interior_EventScript_267D4B compare VAR_RESULT, 4 @@ -33,7 +33,7 @@ FarawayIsland_Interior_MapScript1_267D54: @ 8267D54 end FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 goto_if 5, FarawayIsland_Interior_EventScript_27374E removeobject VAR_LAST_TALKED @@ -148,7 +148,7 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq FarawayIsland_Interior_EventScript_267E96 compare VAR_RESULT, 4 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index e119a0f29..4885c7f15 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8 .byte 0 FortreeCity_PokemonCenter_1F_MapScript1_2173E3: @ 82173E3 - setrespawn 7 + setrespawn HEAL_LOCATION_FORTREE_CITY end FortreeCity_PokemonCenter_1F_EventScript_2173E7:: @ 82173E7 diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 963dd196d..24fe954a8 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -24,7 +24,7 @@ InsideOfTruck_EventScript_23BF04:: @ 823BF04 end InsideOfTruck_EventScript_23BF20:: @ 823BF20 - setrespawn 1 + setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F setvar VAR_0x4092, 1 setflag FLAG_0x2F7 setflag FLAG_0x2FA @@ -37,7 +37,7 @@ InsideOfTruck_EventScript_23BF20:: @ 823BF20 end InsideOfTruck_EventScript_23BF46:: @ 823BF46 - setrespawn 2 + setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F setvar VAR_0x4092, 2 setflag FLAG_0x2F6 setflag FLAG_0x2F9 diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index a96d13902..b00b41d40 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -10,7 +10,7 @@ IslandCave_MapScript1_238E3A: @ 8238E3A end IslandCave_EventScript_238E44:: @ 8238E44 - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 goto_if 5, IslandCave_EventScript_27374E removeobject VAR_LAST_TALKED @@ -107,7 +107,7 @@ IslandCave_EventScript_238F58:: @ 8238F58 special StartRegiBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq IslandCave_EventScript_238F9F compare VAR_RESULT, 4 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index 24f19b1d0..c7db56a0d 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA .byte 0 LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05: @ 81FFB05 - setrespawn 16 + setrespawn HEAL_LOCATION_LAVARIDGE_TOWN call LavaridgeTown_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 87a129620..70018b229 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -255,7 +255,7 @@ LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 compare VAR_RESULT, 0 goto_eq LilycoveCity_EventScript_1E2E5A msgbox LilycoveCity_Text_1E3234, 4 - switch VAR_FIRST_POKE + switch VAR_STARTER_MON case 0, LilycoveCity_EventScript_1E2EDE case 1, LilycoveCity_EventScript_1E2EEE case 2, LilycoveCity_EventScript_1E2EFE @@ -286,7 +286,7 @@ LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B compare VAR_RESULT, 0 goto_eq LilycoveCity_EventScript_1E2ECD msgbox LilycoveCity_Text_1E373C, 4 - switch VAR_FIRST_POKE + switch VAR_STARTER_MON case 0, LilycoveCity_EventScript_1E2F0E case 1, LilycoveCity_EventScript_1E2F1E case 2, LilycoveCity_EventScript_1E2F2E diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc index 234751910..372d16dae 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -118,12 +118,12 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5 applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_2725AA waitmovement 0 waitse - special sub_8139A78 + special ShakeScreenInElevator waitstate setflag FLAG_0x002 return LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC - special sub_8139994 + special SetDepartmentStoreFloorVar return diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index 8de2d5d6f..4a375cf5e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -21,7 +21,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C waitmessage special RetrieveLotteryNumber copyvar VAR_0x8008, VAR_RESULT - special sub_81397C4 + special BufferLottoTicketNumber msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, 4 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8 waitmovement 0 diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 1dfd9c29a..99ad20280 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -89,7 +89,7 @@ LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 msgbox LilycoveCity_Harbor_Text_21E864, 5 compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 - setvar VAR_PORTHOLE, 5 + setvar VAR_PORTHOLE_STATE, 5 call LilycoveCity_Harbor_EventScript_21E5CC warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate @@ -398,7 +398,7 @@ LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 msgbox LilycoveCity_Harbor_Text_21E864, 5 compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 - setvar VAR_PORTHOLE, 5 + setvar VAR_PORTHOLE_STATE, 5 call LilycoveCity_Harbor_EventScript_21E5CC warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index b6ca09906..934f666ad 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2 .byte 0 LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD: @ 821C5BD - setrespawn 8 + setrespawn HEAL_LOCATION_LILYCOVE_CITY goto LilycoveCity_PokemonCenter_1F_EventScript_21C5C6 end diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 74146fc7e..9587bcae3 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -4,7 +4,7 @@ LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785 .byte 0 LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790 - map_script_2 VAR_0x4095, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A + map_script_2 VAR_LILYCOVE_FAN_CLUB_STATE, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A .2byte 0 LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A @@ -24,7 +24,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A waitmovement 0 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807 waitmovement 0 - setvar VAR_0x4095, 2 + setvar VAR_LILYCOVE_FAN_CLUB_STATE, 2 releaseall end @@ -62,45 +62,45 @@ LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807 LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA - compare VAR_0x4095, 1 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8 - compare VAR_0x4095, 2 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 2 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C829 end LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829 - special sub_813BCE8 + special UpdateMovedLilycoveFanClubMembers call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5 setvar VAR_0x8004, 8 - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8 setvar VAR_0x8004, 9 - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0 setvar VAR_0x8004, 10 - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8 setvar VAR_0x8004, 11 - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0 setvar VAR_0x8004, 12 - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8 setvar VAR_0x8004, 13 - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0 setvar VAR_0x8004, 14 - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8 setvar VAR_0x8004, 15 - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0 end @@ -120,35 +120,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1:: @ 821C8F1 LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5 setvar VAR_0x8005, 8 setvar VAR_0x8004, 8 - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 9 - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 10 - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 11 - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 12 - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 13 - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 14 - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 15 - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE compare VAR_0x8005, 5 @@ -208,13 +208,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17 lock faceplayer setvar VAR_0x8004, 13 - special sub_813BDB4 - compare VAR_0x4095, 0 + special BufferStreakTrainerText + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84 - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56 - specialvar VAR_RESULT, sub_813BCA8 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, 4 @@ -222,7 +222,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17 end LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56:: @ 821CA56 - specialvar VAR_RESULT, sub_813BCA8 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, 4 @@ -248,13 +248,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E lock faceplayer setvar VAR_0x8004, 8 - special sub_813BDB4 - compare VAR_0x4095, 0 + special BufferStreakTrainerText + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD - specialvar VAR_RESULT, sub_813BCA8 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, 4 @@ -262,7 +262,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E end LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD:: @ 821CACD - specialvar VAR_RESULT, sub_813BCA8 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, 4 @@ -288,13 +288,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05 lock faceplayer setvar VAR_0x8004, 9 - special sub_813BDB4 - compare VAR_0x4095, 0 + special BufferStreakTrainerText + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72 - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44 - specialvar VAR_RESULT, sub_813BCA8 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, 4 @@ -302,7 +302,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05 end LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44:: @ 821CB44 - specialvar VAR_RESULT, sub_813BCA8 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, 4 @@ -328,13 +328,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C lock faceplayer setvar VAR_0x8004, 10 - special sub_813BDB4 - compare VAR_0x4095, 0 + special BufferStreakTrainerText + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9 - specialvar VAR_RESULT, sub_813BD60 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB - specialvar VAR_RESULT, sub_813BCA8 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, 4 @@ -342,7 +342,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C end LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB:: @ 821CBBB - specialvar VAR_RESULT, sub_813BCA8 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, 4 @@ -368,11 +368,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3 lock faceplayer setvar VAR_0x8004, 11 - special sub_813BDB4 - specialvar VAR_RESULT, sub_813BD60 + special BufferStreakTrainerText + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27 - specialvar VAR_RESULT, sub_813BCA8 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, 4 @@ -380,7 +380,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3 end LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27:: @ 821CC27 - specialvar VAR_RESULT, sub_813BCA8 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, 4 @@ -401,11 +401,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55 lock faceplayer setvar VAR_0x8004, 12 - special sub_813BDB4 - specialvar VAR_RESULT, sub_813BD60 + special BufferStreakTrainerText + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89 - specialvar VAR_RESULT, sub_813BCA8 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, 4 @@ -413,7 +413,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55 end LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89:: @ 821CC89 - specialvar VAR_RESULT, sub_813BCA8 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, 4 @@ -434,11 +434,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7 lock faceplayer setvar VAR_0x8004, 14 - special sub_813BDB4 - specialvar VAR_RESULT, sub_813BD60 + special BufferStreakTrainerText + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB - specialvar VAR_RESULT, sub_813BCA8 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, 4 @@ -446,7 +446,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7 end LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB:: @ 821CCEB - specialvar VAR_RESULT, sub_813BCA8 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, 4 @@ -467,11 +467,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19 lock faceplayer setvar VAR_0x8004, 15 - special sub_813BDB4 - specialvar VAR_RESULT, sub_813BD60 + special BufferStreakTrainerText + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D - specialvar VAR_RESULT, sub_813BCA8 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, 4 @@ -479,7 +479,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19 end LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D - specialvar VAR_RESULT, sub_813BCA8 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, 4 @@ -512,7 +512,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF copyvar VAR_0x800A, VAR_0x8006 setvar VAR_0x8004, 8 - special sub_813BDB4 + special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, 4 setvar VAR_0x8004, 14 copyvar VAR_0x8005, VAR_0x800A @@ -532,7 +532,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0 LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE setvar VAR_0x8004, 8 - special sub_813BDB4 + special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, 5 compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 @@ -542,7 +542,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 setvar VAR_0x8004, 8 - special sub_813BDB4 + special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, 4 setvar VAR_0x8004, 14 copyvar VAR_0x8005, VAR_0x800A @@ -557,7 +557,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D setvar VAR_0x8004, 8 - special sub_813BDB4 + special BufferStreakTrainerText message LilycoveCity_PokemonTrainerFanClub_Text_281C95 waitmessage setvar VAR_0x8004, 2 @@ -568,7 +568,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F case 127, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F setvar VAR_0x8004, 8 - special sub_813BDB4 + special BufferStreakTrainerText copyvar VAR_0x8006, VAR_0x800A copyvar VAR_0x8005, VAR_RESULT special PutFanClubSpecialOnTheAir @@ -577,7 +577,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F setvar VAR_0x8004, 8 - special sub_813BDB4 + special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, 5 compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 @@ -587,14 +587,14 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6 setvar VAR_0x8004, 8 - special sub_813BDB4 + special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, 4 release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8 setvar VAR_0x8004, 8 - special sub_813BDB4 + special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, 4 setflag FLAG_0x0D2 release @@ -602,7 +602,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8 LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED setvar VAR_0x8004, 8 - special sub_813BDB4 + special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, 4 release end diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index 9c821e14f..d6b4bbd8d 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -9,7 +9,7 @@ MarineCave_End_MapScript1_23AFEA: @ 823AFEA end MarineCave_End_EventScript_23AFF4:: @ 823AFF4 - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 goto_if 5, MarineCave_End_EventScript_27374E removeobject 1 @@ -42,7 +42,7 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE setvar VAR_TEMP_1, 0 - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq MarineCave_End_EventScript_23B084 compare VAR_RESULT, 4 diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 400a24c24..733581b74 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -409,7 +409,7 @@ MauvilleCity_GameCorner_EventScript_210137:: @ 8210137 msgbox MauvilleCity_GameCorner_Text_210750, 5 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210209 - switch VAR_FIRST_POKE + switch VAR_STARTER_MON case 0, MauvilleCity_GameCorner_EventScript_21017C case 1, MauvilleCity_GameCorner_EventScript_2101A6 case 2, MauvilleCity_GameCorner_EventScript_2101D0 @@ -540,7 +540,7 @@ MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_8139248 + specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end @@ -551,7 +551,7 @@ MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 1 - specialvar VAR_RESULT, sub_8139248 + specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end @@ -562,7 +562,7 @@ MauvilleCity_GameCorner_EventScript_210316:: @ 8210316 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 2 - specialvar VAR_RESULT, sub_8139248 + specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end @@ -573,7 +573,7 @@ MauvilleCity_GameCorner_EventScript_210336:: @ 8210336 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 3 - specialvar VAR_RESULT, sub_8139248 + specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end @@ -584,7 +584,7 @@ MauvilleCity_GameCorner_EventScript_210356:: @ 8210356 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 4 - specialvar VAR_RESULT, sub_8139248 + specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end @@ -595,7 +595,7 @@ MauvilleCity_GameCorner_EventScript_210376:: @ 8210376 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 5 - specialvar VAR_RESULT, sub_8139248 + specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end @@ -606,7 +606,7 @@ MauvilleCity_GameCorner_EventScript_210396:: @ 8210396 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 6 - specialvar VAR_RESULT, sub_8139248 + specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end @@ -617,7 +617,7 @@ MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 7 - specialvar VAR_RESULT, sub_8139248 + specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end @@ -628,7 +628,7 @@ MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 8 - specialvar VAR_RESULT, sub_8139248 + specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end @@ -639,7 +639,7 @@ MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 9 - specialvar VAR_RESULT, sub_8139248 + specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end @@ -650,7 +650,7 @@ MauvilleCity_GameCorner_EventScript_210416:: @ 8210416 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 10 - specialvar VAR_RESULT, sub_8139248 + specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end @@ -661,7 +661,7 @@ MauvilleCity_GameCorner_EventScript_210436:: @ 8210436 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 11 - specialvar VAR_RESULT, sub_8139248 + specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index fb76a5fc7..b2267122b 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B .byte 0 MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66 - setrespawn 5 + setrespawn HEAL_LOCATION_MAUVILLE_CITY call MauvilleCity_PokemonCenter_1F_EventScript_2718DE goto MauvilleCity_PokemonCenter_1F_EventScript_210E74 end diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index 7fd2e61a0..2ff03b7f3 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F .byte 0 MossdeepCity_PokemonCenter_1F_MapScript1_22224A: @ 822224A - setrespawn 9 + setrespawn HEAL_LOCATION_MOSSDEEP_CITY end MossdeepCity_PokemonCenter_1F_EventScript_22224E:: @ 822224E diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index cce93e624..febe106bf 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -26,7 +26,7 @@ NavelRock_Bottom_MapScript1_269284: @ 8269284 end NavelRock_Bottom_EventScript_26928E:: @ 826928E - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 goto_if 5, NavelRock_Bottom_EventScript_27374E removeobject 1 @@ -64,7 +64,7 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2 special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq NavelRock_Bottom_EventScript_269336 compare VAR_RESULT, 4 diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index 67ddbc373..4310529dd 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -29,7 +29,7 @@ NavelRock_Top_MapScript1_269151: @ 8269151 end NavelRock_Top_EventScript_26915B:: @ 826915B - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 goto_if 5, NavelRock_Top_EventScript_27374E removeobject 1 @@ -69,7 +69,7 @@ NavelRock_Top_EventScript_26916F:: @ 826916F waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE setvar VAR_LAST_TALKED, 1 - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq NavelRock_Top_EventScript_269217 compare VAR_RESULT, 4 diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index 81b21287d..e6d80c33d 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -14,7 +14,7 @@ NewMauville_Inside_MapScript1_2373E7: @ 82373E7 end NewMauville_Inside_EventScript_237407:: @ 8237407 - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 goto_if 5, NewMauville_Inside_EventScript_27374E removeobject VAR_LAST_TALKED @@ -193,7 +193,7 @@ NewMauville_Inside_EventScript_2377AF:: @ 82377AF setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq NewMauville_Inside_EventScript_2377F3 compare VAR_RESULT, 4 @@ -220,7 +220,7 @@ NewMauville_Inside_EventScript_2377FC:: @ 82377FC setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq NewMauville_Inside_EventScript_237840 compare VAR_RESULT, 4 @@ -247,7 +247,7 @@ NewMauville_Inside_EventScript_237849:: @ 8237849 setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq NewMauville_Inside_EventScript_23788D compare VAR_RESULT, 4 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index ece540e70..e99e628a6 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006 .byte 0 OldaleTown_PokemonCenter_1F_MapScript1_1FC011: @ 81FC011 - setrespawn 14 + setrespawn HEAL_LOCATION_OLDALE_TOWN call OldaleTown_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index 0e87677e6..21345242d 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -25,7 +25,7 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792 PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE checkflag FLAG_0x12B goto_if 0, PacifidlogTown_House2_EventScript_27374E - specialvar VAR_RESULT, sub_813970C + specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable compare VAR_RESULT, 0 call_if 1, PacifidlogTown_House2_EventScript_203812 return @@ -49,7 +49,7 @@ PacifidlogTown_House2_EventScript_203816:: @ 8203816 compare VAR_RESULT, 0 goto_eq PacifidlogTown_House2_EventScript_272054 setflag FLAG_0x12B - special sub_8139754 + special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_203A85, 4 release end @@ -65,13 +65,13 @@ PacifidlogTown_House2_EventScript_20384F:: @ 820384F compare VAR_RESULT, 0 goto_eq PacifidlogTown_House2_EventScript_272054 setflag FLAG_0x12B - special sub_8139754 + special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_203A85, 4 release end PacifidlogTown_House2_EventScript_20387E:: @ 820387E - specialvar VAR_RESULT, sub_813970C + specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable buffernumberstring 0, VAR_RESULT msgbox PacifidlogTown_House2_Text_203AF4, 4 release diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index fd34cd2aa..65af1cdc7 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7 .byte 0 PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2: @ 82034B2 - setrespawn 19 + setrespawn HEAL_LOCATION_PACIFIDLOG_TOWN end PacifidlogTown_PokemonCenter_1F_EventScript_2034B6:: @ 82034B6 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index f4a31854e..130a43de9 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8 .byte 0 PetalburgCity_PokemonCenter_1F_MapScript1_2079F3: @ 82079F3 - setrespawn 3 + setrespawn HEAL_LOCATION_PETALBURG_CITY call PetalburgCity_PokemonCenter_1F_EventScript_2718DE end @@ -35,11 +35,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C end PetalburgCity_PokemonCenter_1F_EventScript_207A38:: @ 8207A38 - compare VAR_FIRST_POKE, 0 + compare VAR_STARTER_MON, 0 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A5B - compare VAR_FIRST_POKE, 1 + compare VAR_STARTER_MON, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A64 - compare VAR_FIRST_POKE, 2 + compare VAR_STARTER_MON, 2 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A6D release end diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 14e119cd6..6674662f7 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -38,7 +38,7 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA applymovement 2, Route103_Movement_27259A waitmovement 0 msgbox Route103_Text_1EC7DE, 4 - switch VAR_FIRST_POKE + switch VAR_STARTER_MON case 0, Route103_EventScript_1EC48E case 1, Route103_EventScript_1EC49E case 2, Route103_EventScript_1EC4AE @@ -55,7 +55,7 @@ Route103_EventScript_1EC434:: @ 81EC434 applymovement 2, Route103_Movement_27259A waitmovement 0 msgbox Route103_Text_1EC9CE, 4 - switch VAR_FIRST_POKE + switch VAR_STARTER_MON case 0, Route103_EventScript_1EC4BE case 1, Route103_EventScript_1EC4CE case 2, Route103_EventScript_1EC4DE diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 4755494b6..9b45844f0 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -153,7 +153,7 @@ Route104_EventScript_1ECDD0:: @ 81ECDD0 Route104_EventScript_1ECDED:: @ 81ECDED msgbox Route104_Text_1EDDDB, 4 - switch VAR_FIRST_POKE + switch VAR_STARTER_MON case 0, Route104_EventScript_1ECE36 case 1, Route104_EventScript_1ECE49 case 2, Route104_EventScript_1ECE5C @@ -230,7 +230,7 @@ Route104_EventScript_1ECEEC:: @ 81ECEEC Route104_EventScript_1ECF09:: @ 81ECF09 msgbox Route104_Text_1EE0C7, 4 - switch VAR_FIRST_POKE + switch VAR_STARTER_MON case 0, Route104_EventScript_1ECF4D case 1, Route104_EventScript_1ECF60 case 2, Route104_EventScript_1ECF73 diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc index 6e6d17d9a..f4875cc6c 100644 --- a/data/maps/Route110/events.inc +++ b/data/maps/Route110/events.inc @@ -45,8 +45,8 @@ Route110_MapWarps: @ 8529050 warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE Route110_MapCoordEvents: @ 8529080 - coord_event 28, 92, 3, VAR_0x40A9, 2, Route110_EventScript_1EF661 - coord_event 29, 92, 3, VAR_0x40A9, 2, Route110_EventScript_1EF661 + coord_event 28, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661 + coord_event 29, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661 coord_event 33, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF74D coord_event 34, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF758 coord_event 35, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF763 diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 84d50b454..fe07de8dc 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -11,7 +11,7 @@ Route110_MapScript1_1EF279: @ 81EF279 Route110_MapScript1_1EF27D: @ 81EF27D call Route110_EventScript_271ED7 call Route110_EventScript_271EFB - compare VAR_0x40A9, 1 + compare VAR_CYCLING_CHALLENGE_STATE, 1 call_if 1, Route110_EventScript_1EF293 end @@ -20,12 +20,12 @@ Route110_EventScript_1EF293:: @ 81EF293 return Route110_MapScript2_1EF297: @ 81EF297 - map_script_2 VAR_0x40A9, 1, Route110_EventScript_1EF2A1 + map_script_2 VAR_CYCLING_CHALLENGE_STATE, 1, Route110_EventScript_1EF2A1 .2byte 0 Route110_EventScript_1EF2A1:: @ 81EF2A1 special Special_BeginCyclingRoadChallenge - setvar VAR_0x40A9, 2 + setvar VAR_CYCLING_CHALLENGE_STATE, 2 return Route110_EventScript_1EF2AA:: @ 81EF2AA @@ -148,7 +148,7 @@ Route110_EventScript_1EF3B7:: @ 81EF3B7 specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF3E8 - compare VAR_0x40A9, 0 + compare VAR_CYCLING_CHALLENGE_STATE, 0 goto_eq Route110_EventScript_1EF3DE msgbox Route110_Text_1F06FB, 4 release @@ -368,7 +368,7 @@ Route110_EventScript_1EF735:: @ 81EF735 end Route110_EventScript_1EF743:: @ 81EF743 - setvar VAR_0x40A9, 3 + setvar VAR_CYCLING_CHALLENGE_STATE, 3 savebgm MUS_DUMMY fadedefaultbgm return @@ -426,7 +426,7 @@ Route110_EventScript_1EF7E6:: @ 81EF7E6 Route110_EventScript_1EF7EB:: @ 81EF7EB msgbox Route110_Text_1EFC48, 4 - switch VAR_FIRST_POKE + switch VAR_STARTER_MON case 0, Route110_EventScript_1EF81A case 1, Route110_EventScript_1EF82A case 2, Route110_EventScript_1EF83A @@ -456,7 +456,7 @@ Route110_EventScript_1EF84A:: @ 81EF84A Route110_EventScript_1EF865:: @ 81EF865 msgbox Route110_Text_1EFE3F, 4 - switch VAR_FIRST_POKE + switch VAR_STARTER_MON case 0, Route110_EventScript_1EF894 case 1, Route110_EventScript_1EF8A4 case 2, Route110_EventScript_1EF8B4 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index 9f99cf44f..b38bbf896 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -3,14 +3,14 @@ Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1 .byte 0 Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7: @ 826EBA7 - compare VAR_0x40A9, 3 + compare VAR_CYCLING_CHALLENGE_STATE, 3 call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE - compare VAR_0x40A9, 2 + compare VAR_CYCLING_CHALLENGE_STATE, 2 call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE end Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE:: @ 826EBBE - setvar VAR_0x40A9, 1 + setvar VAR_CYCLING_CHALLENGE_STATE, 1 return Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4:: @ 826EBC4 @@ -33,7 +33,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0:: @ 826EBD0 end Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6:: @ 826EBF6 - setvar VAR_0x40A9, 1 + setvar VAR_CYCLING_CHALLENGE_STATE, 1 return Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC:: @ 826EBFC @@ -50,7 +50,7 @@ Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11: @ 826EC11 Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13:: @ 826EC13 lockall - setvar VAR_0x40A9, 0 + setvar VAR_CYCLING_CHALLENGE_STATE, 0 clearflag FLAG_SYS_CYCLING_ROAD setvar VAR_TEMP_1, 0 releaseall diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 854411ac1..769d254a5 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -169,7 +169,7 @@ Route116_EventScript_1F2DB6:: @ 81F2DB6 checkitem ITEM_BLACK_GLASSES, 1 compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2DF1 - specialvar VAR_RESULT, sub_8139634 + specialvar VAR_RESULT, FoundBlackGlasses compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2DE2 msgbox Route116_Text_1F3657, 4 @@ -185,7 +185,7 @@ Route116_EventScript_1F2DE2:: @ 81F2DE2 Route116_EventScript_1F2DF1:: @ 81F2DF1 msgbox Route116_Text_1F3657, 4 msgbox Route116_Text_1F3688, 4 - specialvar VAR_RESULT, sub_8139634 + specialvar VAR_RESULT, FoundBlackGlasses compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2E1B msgbox Route116_Text_1F375E, 4 diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc index f9dbbd3f2..b2c009337 100644 --- a/data/maps/Route116_TunnelersRestHouse/scripts.inc +++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc @@ -17,7 +17,7 @@ Route116_TunnelersRestHouse_EventScript_22B863:: @ 822B863 Route116_TunnelersRestHouse_EventScript_22B86C:: @ 822B86C lock faceplayer - checkflag FLAG_0x0C7 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_eq Route116_TunnelersRestHouse_EventScript_22B881 msgbox Route116_TunnelersRestHouse_Text_22BAAF, 4 release diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 778d925e6..f2e52d50c 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -9,7 +9,7 @@ Route119_MapScript1_1F442F: @ 81F442F end Route119_EventScript_1F4439:: @ 81F4439 - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 goto_if 5, Route119_EventScript_27374E removeobject VAR_LAST_TALKED @@ -80,7 +80,7 @@ Route119_EventScript_1F4506:: @ 81F4506 Route119_EventScript_1F450B:: @ 81F450B msgbox Route119_Text_1F49FD, 4 - switch VAR_FIRST_POKE + switch VAR_STARTER_MON case 0, Route119_EventScript_1F453A case 1, Route119_EventScript_1F454A case 2, Route119_EventScript_1F455A @@ -110,7 +110,7 @@ Route119_EventScript_1F456A:: @ 81F456A Route119_EventScript_1F4585:: @ 81F4585 msgbox Route119_Text_1F4C9A, 4 - switch VAR_FIRST_POKE + switch VAR_STARTER_MON case 0, Route119_EventScript_1F45B4 case 1, Route119_EventScript_1F45C4 case 2, Route119_EventScript_1F45D4 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 50e5742d1..0bcff1a93 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -25,7 +25,7 @@ Route120_EventScript_1F5406:: @ 81F5406 return Route120_EventScript_1F5449:: @ 81F5449 - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 goto_if 5, Route120_EventScript_27374E removeobject 30 @@ -33,7 +33,7 @@ Route120_EventScript_1F5449:: @ 81F5449 return Route120_EventScript_1F5460:: @ 81F5460 - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 goto_if 5, Route120_EventScript_27374E removeobject VAR_LAST_TALKED @@ -220,7 +220,7 @@ Route120_EventScript_1F568B:: @ 81F568B setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq Route120_EventScript_1F571C compare VAR_RESULT, 4 diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 6eb8d48bc..f4c8d5434 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -306,7 +306,7 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD clearflag FLAG_0x2DC setflag FLAG_0x08E setvar VAR_0x405A, 2 - setvar VAR_0x409A, 2 + setvar VAR_RUSTURF_TUNNEL_STATE, 2 setvar VAR_0x406F, 1 clearflag FLAG_0x37B clearflag FLAG_0x370 @@ -869,7 +869,7 @@ RustboroCity_EventScript_1E1070:: @ 81E1070 RustboroCity_EventScript_1E1092:: @ 81E1092 msgbox RustboroCity_Text_1E1C84, 4 - switch VAR_FIRST_POKE + switch VAR_STARTER_MON case 0, RustboroCity_EventScript_1E10DB case 1, RustboroCity_EventScript_1E10EE case 2, RustboroCity_EventScript_1E1101 @@ -940,7 +940,7 @@ RustboroCity_EventScript_1E1174:: @ 81E1174 RustboroCity_EventScript_1E1191:: @ 81E1191 msgbox RustboroCity_Text_1E1FA9, 4 - switch VAR_FIRST_POKE + switch VAR_STARTER_MON case 0, RustboroCity_EventScript_1E11D5 case 1, RustboroCity_EventScript_1E11E8 case 2, RustboroCity_EventScript_1E11FB diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index a9156d5aa..acf33e647 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62 .byte 0 RustboroCity_PokemonCenter_1F_MapScript1_214D6D: @ 8214D6D - setrespawn 6 + setrespawn HEAL_LOCATION_RUSTBORO_CITY call RustboroCity_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc index d0d56e6fa..77b6f7a61 100644 --- a/data/maps/RusturfTunnel/events.inc +++ b/data/maps/RusturfTunnel/events.inc @@ -17,8 +17,8 @@ RusturfTunnel_MapWarps: @ 85342B4 RusturfTunnel_MapCoordEvents: @ 85342CC coord_event 23, 4, 3, 0, 0, RusturfTunnel_EventScript_22D071 - coord_event 9, 4, 3, VAR_0x409A, 2, RusturfTunnel_EventScript_22D083 - coord_event 9, 5, 3, VAR_0x409A, 2, RusturfTunnel_EventScript_22D083 + coord_event 9, 4, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083 + coord_event 9, 5, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083 coord_event 25, 4, 3, 0, 0, RusturfTunnel_EventScript_22D077 coord_event 25, 5, 3, 0, 0, RusturfTunnel_EventScript_22D07D diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 5e42be78d..33e87bda5 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -4,12 +4,12 @@ RusturfTunnel_MapScripts:: @ 822CE27 .byte 0 RusturfTunnel_MapScript2_22CE32: @ 822CE32 - map_script_2 VAR_0x409A, 4, RusturfTunnel_EventScript_22CEAE - map_script_2 VAR_0x409A, 5, RusturfTunnel_EventScript_22CEAE + map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_22CEAE + map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_22CEAE .2byte 0 RusturfTunnel_MapScript1_22CE44: @ 822CE44 - compare VAR_0x409A, 2 + compare VAR_RUSTURF_TUNNEL_STATE, 2 call_if 1, RusturfTunnel_EventScript_22CE50 end @@ -288,7 +288,7 @@ RusturfTunnel_EventScript_22D083:: @ 822D083 waitmovement 0 moveobjectoffscreen 6 moveobjectoffscreen 7 - setvar VAR_0x409A, 3 + setvar VAR_RUSTURF_TUNNEL_STATE, 3 releaseall end diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 2e1b4cfa4..8fcd6e59b 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -4,15 +4,15 @@ SSTidalCorridor_MapScripts:: @ 823BFCF SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5 map_script_2 VAR_0x40D4, 0, SSTidalCorridor_EventScript_23C219 - map_script_2 VAR_PORTHOLE, 1, SSTidalCorridor_EventScript_23BFFF - map_script_2 VAR_PORTHOLE, 5, SSTidalCorridor_EventScript_23C015 - map_script_2 VAR_PORTHOLE, 9, SSTidalCorridor_EventScript_23C067 - map_script_2 VAR_PORTHOLE, 10, SSTidalCorridor_EventScript_23C07D + map_script_2 VAR_PORTHOLE_STATE, 1, SSTidalCorridor_EventScript_23BFFF + map_script_2 VAR_PORTHOLE_STATE, 5, SSTidalCorridor_EventScript_23C015 + map_script_2 VAR_PORTHOLE_STATE, 9, SSTidalCorridor_EventScript_23C067 + map_script_2 VAR_PORTHOLE_STATE, 10, SSTidalCorridor_EventScript_23C07D .2byte 0 SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF special SetSSTidalFlag - setvar VAR_PORTHOLE, 2 + setvar VAR_PORTHOLE_STATE, 2 lockall playse SE_PINPON msgbox SSTidalCorridor_Text_23C462, 4 @@ -20,7 +20,7 @@ SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF end SSTidalCorridor_EventScript_23C015:: @ 823C015 - setvar VAR_PORTHOLE, 6 + setvar VAR_PORTHOLE_STATE, 6 lockall playse SE_PINPON msgbox SSTidalCorridor_Text_23C4E3, 4 @@ -29,28 +29,28 @@ SSTidalCorridor_EventScript_23C015:: @ 823C015 SSTidalRooms_EventScript_23C028:: @ 823C028 special SetSSTidalFlag - setvar VAR_PORTHOLE, 7 + setvar VAR_PORTHOLE_STATE, 7 playse SE_PINPON msgbox SSTidalRooms_Text_23C462, 4 return SSTidalRooms_EventScript_23C03C:: @ 823C03C special ResetSSTidalFlag - setvar VAR_PORTHOLE, 4 + setvar VAR_PORTHOLE_STATE, 4 playse SE_PINPON msgbox SSTidalRooms_Text_23C553, 4 return SSTidalCorridor_EventScript_23C050:: @ 823C050 - compare VAR_PORTHOLE, 2 + compare VAR_PORTHOLE_STATE, 2 goto_eq SSTidalCorridor_EventScript_23C067 - compare VAR_PORTHOLE, 7 + compare VAR_PORTHOLE_STATE, 7 goto_eq SSTidalCorridor_EventScript_23C07D end SSTidalCorridor_EventScript_23C067:: @ 823C067 special ResetSSTidalFlag - setvar VAR_PORTHOLE, 3 + setvar VAR_PORTHOLE_STATE, 3 lockall playse SE_PINPON msgbox SSTidalCorridor_Text_23C4E3, 4 @@ -59,7 +59,7 @@ SSTidalCorridor_EventScript_23C067:: @ 823C067 SSTidalCorridor_EventScript_23C07D:: @ 823C07D special ResetSSTidalFlag - setvar VAR_PORTHOLE, 8 + setvar VAR_PORTHOLE_STATE, 8 lockall playse SE_PINPON msgbox SSTidalCorridor_Text_23C50F, 4 @@ -68,13 +68,13 @@ SSTidalCorridor_EventScript_23C07D:: @ 823C07D SSTidalRooms_EventScript_23C093:: @ 823C093 special ResetSSTidalFlag - setvar VAR_PORTHOLE, 8 + setvar VAR_PORTHOLE_STATE, 8 playse SE_PINPON msgbox SSTidalRooms_Text_23C50F, 4 return SSTidalRooms_EventScript_23C0A7:: @ 823C0A7 - switch VAR_PORTHOLE + switch VAR_PORTHOLE_STATE case 2, SSTidalRooms_EventScript_23C03C case 3, SSTidalRooms_EventScript_23C03C case 6, SSTidalRooms_EventScript_23C028 @@ -114,16 +114,16 @@ SSTidalCorridor_EventScript_23C110:: @ 823C110 SSTidalCorridor_EventScript_23C119:: @ 823C119 lock faceplayer - compare VAR_PORTHOLE, 4 + compare VAR_PORTHOLE_STATE, 4 goto_eq SSTidalCorridor_EventScript_23C13B - compare VAR_PORTHOLE, 8 + compare VAR_PORTHOLE_STATE, 8 goto_eq SSTidalCorridor_EventScript_23C15A msgbox SSTidalCorridor_Text_23C596, 4 release end SSTidalCorridor_EventScript_23C13B:: @ 823C13B - setrespawn 8 + setrespawn HEAL_LOCATION_LILYCOVE_CITY msgbox SSTidalCorridor_Text_23C64F, 4 checkflag FLAG_0x104 call_if 1, SSTidalCorridor_EventScript_23C179 @@ -133,7 +133,7 @@ SSTidalCorridor_EventScript_23C13B:: @ 823C13B end SSTidalCorridor_EventScript_23C15A:: @ 823C15A - setrespawn 4 + setrespawn HEAL_LOCATION_SLATEPORT_CITY msgbox SSTidalCorridor_Text_23C64F, 4 checkflag FLAG_0x104 call_if 1, SSTidalCorridor_EventScript_23C179 @@ -148,9 +148,9 @@ SSTidalCorridor_EventScript_23C179:: @ 823C179 SSTidalCorridor_EventScript_23C17D:: @ 823C17D lockall - compare VAR_PORTHOLE, 2 + compare VAR_PORTHOLE_STATE, 2 goto_eq SSTidalCorridor_EventScript_23C19E - compare VAR_PORTHOLE, 7 + compare VAR_PORTHOLE_STATE, 7 goto_eq SSTidalCorridor_EventScript_23C19E msgbox SSTidalCorridor_Text_23C6C3, 4 releaseall diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 334acc8ac..690464698 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -10,7 +10,7 @@ SkyPillar_Top_MapScript1_2396C8: @ 82396C8 end SkyPillar_Top_EventScript_2396D2:: @ 82396D2 - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 goto_if 5, SkyPillar_Top_EventScript_27374E removeobject VAR_LAST_TALKED @@ -56,7 +56,7 @@ SkyPillar_Top_EventScript_239722:: @ 8239722 special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq SkyPillar_Top_EventScript_239768 compare VAR_RESULT, 4 diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index e1f373bb2..58c318d37 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -203,7 +203,7 @@ SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 msgbox SlateportCity_Harbor_Text_20CF93, 5 compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CBDD - setvar VAR_PORTHOLE, 1 + setvar VAR_PORTHOLE_STATE, 1 call SlateportCity_Harbor_EventScript_20CBE9 warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc index 8ecc859f7..745cc6627 100644 --- a/data/maps/SlateportCity_House1/scripts.inc +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -34,7 +34,7 @@ SlateportCity_House1_EventScript_209AF3:: @ 8209AF3 special TV_CheckMonOTIDEqualsPlayerID compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209B50 - specialvar VAR_RESULT, sub_8139770 + specialvar VAR_RESULT, MonOTNameMatchesPlayer special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209B50 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index 404804c57..dd62280bb 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF .byte 0 SlateportCity_PokemonCenter_1F_MapScript1_20DACA: @ 820DACA - setrespawn 4 + setrespawn HEAL_LOCATION_SLATEPORT_CITY call SlateportCity_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index cdcf5866c..652ac791a 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -91,7 +91,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E:: @ 8227A4E SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 special SavePlayerParty - special sub_8139238 + special BufferEReaderTrainerName msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, 5 compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index fcb1b5863..46dccd97e 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1 .byte 0 SootopolisCity_PokemonCenter_1F_MapScript1_2264FC: @ 82264FC - setrespawn 10 + setrespawn HEAL_LOCATION_SOOTOPOLIS_CITY end SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500 diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 432667cc9..3005e32d7 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -9,7 +9,7 @@ SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 end SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 goto_if 5, SouthernIsland_Interior_EventScript_27374E removeobject 2 @@ -90,7 +90,7 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 special BattleSetup_StartLatiBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq SouthernIsland_Interior_EventScript_242B81 compare VAR_RESULT, 4 diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index 5152f85cf..d603f2274 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -9,7 +9,7 @@ TerraCave_End_MapScript1_23B0BB: @ 823B0BB end TerraCave_End_EventScript_23B0C5:: @ 823B0C5 - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 goto_if 5, TerraCave_End_EventScript_27374E removeobject 1 @@ -42,7 +42,7 @@ TerraCave_End_EventScript_23B0EC:: @ 823B0EC waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE setvar VAR_TEMP_1, 0 - specialvar VAR_RESULT, sub_8138B80 + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 goto_eq TerraCave_End_EventScript_23B155 compare VAR_RESULT, 4 diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc index ac2d5c8a7..ff731393b 100644 --- a/data/maps/TrainerHill_Elevator/scripts.inc +++ b/data/maps/TrainerHill_Elevator/scripts.inc @@ -50,7 +50,7 @@ TrainerHill_Elevator_EventScript_2693D4:: @ 82693D4 TrainerHill_Elevator_EventScript_2693D9:: @ 82693D9 waitse - special sub_8139A78 + special ShakeScreenInElevator waitstate return diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index 2987a9a59..8cc8f6f4d 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -10,7 +10,7 @@ VerdanturfTown_MapScript1_1EB56C: @ 81EB56C VerdanturfTown_EventScript_1EB575:: @ 81EB575 lock faceplayer - checkflag FLAG_0x0C7 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_eq VerdanturfTown_EventScript_1EB594 msgbox VerdanturfTown_Text_1EB5FD, 4 applymovement 2, VerdanturfTown_Movement_2725A2 @@ -36,7 +36,7 @@ VerdanturfTown_EventScript_1EB5B1:: @ 81EB5B1 VerdanturfTown_EventScript_1EB5BA:: @ 81EB5BA lock faceplayer - checkflag FLAG_0x0C7 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_eq VerdanturfTown_EventScript_1EB5CF msgbox VerdanturfTown_Text_1EB854, 4 release diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index 73c7fe1f3..131df00f7 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726 .byte 0 VerdanturfTown_PokemonCenter_1F_MapScript1_202731: @ 8202731 - setrespawn 18 + setrespawn HEAL_LOCATION_VERDANTURF_TOWN call VerdanturfTown_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/VerdanturfTown_WandasHouse/scripts.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc index fabff6420..8184f4c21 100644 --- a/data/maps/VerdanturfTown_WandasHouse/scripts.inc +++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc @@ -69,7 +69,7 @@ VerdanturfTown_WandasHouse_EventScript_20294E:: @ 820294E goto_eq VerdanturfTown_WandasHouse_EventScript_202989 checkflag FLAG_0x4F3 goto_eq VerdanturfTown_WandasHouse_EventScript_20297F - checkflag FLAG_0x0C7 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_eq VerdanturfTown_WandasHouse_EventScript_202975 msgbox VerdanturfTown_WandasHouse_Text_202E47, 4 release diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s index 51e515ccb..0c22aa6cd 100644 --- a/data/pokemon_summary_screen.s +++ b/data/pokemon_summary_screen.s @@ -3,9 +3,6 @@ .section .rodata -@ 86181C1 - .include "data/text/move_descriptions.inc" - @ 861CAAC .include "data/text/nature_names.inc" diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index df25056ea..d0936b9c1 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -113,7 +113,7 @@ Route111_EventScript_2907FB:: @ 82907FB applymovement VAR_LAST_TALKED, Route111_Movement_29082B waitmovement 0 removeobject VAR_LAST_TALKED - specialvar VAR_RESULT, sub_81393FC + specialvar VAR_RESULT, TryUpdateRusturfTunnelState compare VAR_RESULT, 1 goto_eq Route111_EventScript_290829 special RockSmashWildEncounter diff --git a/data/specials.inc b/data/specials.inc index 1020b1c80..86355f484 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -174,11 +174,11 @@ gSpecials:: @ 81DBA64 def_special GetFirstFreePokeblockSlot def_special DoBerryBlending def_special sub_8142BC8 - def_special sub_813BD60 - def_special sub_813BCA8 - def_special sub_813BDB4 + def_special ShouldMoveLilycoveFanClubMember + def_special GetNumMovedLilycoveFanClubMembers + def_special BufferStreakTrainerText def_special sub_813BA30 - def_special sub_813BCE8 + def_special UpdateMovedLilycoveFanClubMembers def_special sub_813BF60 def_special sub_813BA60 def_special sub_813BF7C @@ -191,7 +191,7 @@ gSpecials:: @ 81DBA64 def_special GabbyAndTyGetLastQuote def_special GabbyAndTyGetLastBattleTrivia def_special GabbyAndTySetScriptVarsToEventObjectLocalIds - def_special sub_8138B80 + def_special GetBattleOutcome def_special GetDaycareMonNicknames def_special GetDaycareState def_special RejectEggFromDayCare @@ -227,7 +227,7 @@ gSpecials:: @ 81DBA64 def_special ShowPokedexRatingMessage def_special DoPCTurnOnEffect def_special DoPCTurnOffEffect - def_special sub_8139994 + def_special SetDepartmentStoreFloorVar def_special DoLotteryCornerComputerEffect def_special EndLotteryCornerComputerEffect def_special sub_81B951C @@ -258,7 +258,7 @@ gSpecials:: @ 81DBA64 def_special sub_81B9D08 def_special sub_80F9490 def_special ValidateEReaderTrainer - def_special sub_8139228 + def_special GetBestBattleTowerStreak def_special sub_80F94E8 def_special BedroomPC def_special PlayerPC @@ -284,7 +284,7 @@ gSpecials:: @ 81DBA64 def_special sub_80FB7A4 def_special DoSoftReset def_special GameClear - def_special sub_8139A78 + def_special ShakeScreenInElevator def_special nullsub_55 def_special SpawnScriptEventObject def_special RemoveScriptEventObject @@ -295,20 +295,20 @@ gSpecials:: @ 81DBA64 def_special sub_80B0534 def_special sub_80B058C def_special WaitWeather - def_special sub_8139238 - def_special sub_8139248 + def_special BufferEReaderTrainerName + def_special GetSlotMachineId def_special GetPlayerFacingDirection - def_special sub_81392AC - def_special sub_81392D4 - def_special sub_81392F8 - def_special sub_8139320 + def_special FoundAbandonedShipRoom1Key + def_special FoundAbandonedShipRoom2Key + def_special FoundAbandonedShipRoom4Key + def_special FoundAbandonedShipRoom6Key def_special LeadMonHasEffortRibbon def_special GiveLeadMonEffortRibbon def_special Special_AreLeadMonEVsMaxedOut def_special sub_8098574 def_special sub_809859C def_special InitRoamer - def_special sub_81393FC + def_special TryUpdateRusturfTunnelState def_special IsGrassTypeInParty def_special sub_80AFC60 def_special PutZigzagoonInPlayerParty @@ -326,7 +326,7 @@ gSpecials:: @ 81DBA64 def_special StartRegiBattle def_special sub_80B16D8 def_special DoSealedChamberShakingEffect2 - def_special sub_8139634 + def_special FoundBlackGlasses def_special sub_80AC81C def_special sp13E_warp_to_last_warp def_special sp13F_fall_to_last_warp @@ -343,11 +343,11 @@ gSpecials:: @ 81DBA64 def_special sub_80E9B70 def_special LoadPlayerBag def_special sub_80B05B4 - def_special sub_8139754 - def_special sub_813970C + def_special SetPacifidlogTMReceivedDay + def_special GetDaysUntilPacifidlogTMAvailable def_special sub_80C08E4 - def_special sub_8139770 - def_special sub_81397C4 + def_special MonOTNameMatchesPlayer + def_special BufferLottoTicketNumber def_special sub_81653CC def_special sub_80F9370 def_special sub_80F8FE8 diff --git a/data/text/move_descriptions.inc b/data/text/move_descriptions.inc deleted file mode 100644 index 0f6b1adbf..000000000 --- a/data/text/move_descriptions.inc +++ /dev/null @@ -1,1421 +0,0 @@ -gNullMoveDescription:: @ 86181C0 - .string "$" - -gPoundMoveDescription:: @ 86181C1 - .string "Pounds the foe with\nforelegs or tail.$" - -gKarateChopMoveDescription:: @ 86181E7 - .string "A chopping attack with a\nhigh critical-hit ratio.$" - -gDoubleSlapMoveDescription:: @ 8618219 - .string "Repeatedly slaps the foe\n2 to 5 times.$" - -gCometPunchMoveDescription:: @ 8618240 - .string "Repeatedly punches the foe\n2 to 5 times.$" - -gMegaPunchMoveDescription:: @ 8618269 - .string "A strong punch thrown with\nincredible power.$" - -gPayDayMoveDescription:: @ 8618296 - .string "Throws coins at the foe.\nMoney is recovered after.$" - -gFirePunchMoveDescription:: @ 86182C9 - .string "A fiery punch that may burn\nthe foe.$" - -gIcePunchMoveDescription:: @ 86182EE - .string "An icy punch that may\nfreeze the foe.$" - -gThunderPunchMoveDescription:: @ 8618314 - .string "An electrified punch that\nmay paralyze the foe.$" - -gScratchMoveDescription:: @ 8618344 - .string "Scratches the foe with\nsharp claws.$" - -gViceGripMoveDescription:: @ 8618368 - .string "Grips the foe with large and\npowerful pincers.$" - -gGuillotineMoveDescription:: @ 8618397 - .string "A powerful pincer attack\nthat may cause fainting.$" - -gRazorWindMoveDescription:: @ 86183C9 - .string "A 2-turn move that strikes\nthe foe on the 2nd turn.$" - -gSwordsDanceMoveDescription:: @ 86183FD - .string "A fighting dance that\nsharply raises ATTACK.$" - -gCutMoveDescription:: @ 861842A - .string "Cuts the foe with sharp\nscythes, claws, etc.$" - -gGustMoveDescription:: @ 8618457 - .string "Strikes the foe with a gust\nof wind whipped up by wings.$" - -gWingAttackMoveDescription:: @ 8618490 - .string "Strikes the foe with wings\nspread wide.$" - -gWhirlwindMoveDescription:: @ 86184B8 - .string "Blows away the foe with\nwind and ends the battle.$" - -gFlyMoveDescription:: @ 86184EA - .string "Flies up on the first turn,\nthen strikes the next turn.$" - -gBindMoveDescription:: @ 8618522 - .string "Binds and squeezes the foe\nfor 2 to 5 turns.$" - -gSlamMoveDescription:: @ 861854F - .string "Slams the foe with a long\ntail, vine, etc.$" - -gVineWhipMoveDescription:: @ 861857A - .string "Strikes the foe with\nslender, whiplike vines.$" - -gStompMoveDescription:: @ 86185A8 - .string "Stomps the enemy with a big\nfoot. May cause flinching.$" - -gDoubleKickMoveDescription:: @ 86185DF - .string "A double-kicking attack\nthat strikes the foe twice.$" - -gMegaKickMoveDescription:: @ 8618613 - .string "An extremely powerful kick\nwith intense force.$" - -gJumpKickMoveDescription:: @ 8618642 - .string "A strong jumping kick. May\nmiss and hurt the kicker.$" - -gRollingKickMoveDescription:: @ 8618677 - .string "A fast kick delivered from\na rapid spin.$" - -gSandAttackMoveDescription:: @ 86186A0 - .string "Reduces the foe’s accuracy\nby hurling sand in its face.$" - -gHeadbuttMoveDescription:: @ 86186D8 - .string "A ramming attack that may\ncause flinching.$" - -gHornAttackMoveDescription:: @ 8618703 - .string "Jabs the foe with sharp\nhorns.$" - -gFuryAttackMoveDescription:: @ 8618722 - .string "Jabs the foe 2 to 5 times\nwith sharp horns, etc.$" - -gHornDrillMoveDescription:: @ 8618753 - .string "A one-hit KO attack that\nuses a horn like a drill.$" - -gTackleMoveDescription:: @ 8618786 - .string "Charges the foe with a full-\nbody tackle.$" - -gBodySlamMoveDescription:: @ 86187B0 - .string "A full-body slam that may\ncause paralysis.$" - -gWrapMoveDescription:: @ 86187DB - .string "Wraps and squeezes the foe\n2 to 5 times with vines, etc.$" - -gTakeDownMoveDescription:: @ 8618814 - .string "A reckless charge attack\nthat also hurts the user.$" - -gThrashMoveDescription:: @ 8618847 - .string "A rampage of 2 to 3 turns\nthat confuses the user.$" - -gDoubleEdgeMoveDescription:: @ 8618879 - .string "A life-risking tackle that\nalso hurts the user.$" - -gTailWhipMoveDescription:: @ 86188A9 - .string "Wags the tail to lower the\nfoe’s DEFENSE.$" - -gPoisonStingMoveDescription:: @ 86188D3 - .string "A toxic attack with barbs,\netc., that may poison.$" - -gTwineedleMoveDescription:: @ 8618905 - .string "Stingers on the forelegs\njab the foe twice.$" - -gPinMissileMoveDescription:: @ 8618931 - .string "Sharp pins are fired to\nstrike 2 to 5 times.$" - -gLeerMoveDescription:: @ 861895E - .string "Frightens the foe with a\nleer to lower DEFENSE.$" - -gBiteMoveDescription:: @ 861898E - .string "Bites with vicious fangs.\nMay cause flinching.$" - -gGrowlMoveDescription:: @ 86189BD - .string "Growls cutely to reduce the\nfoe’s ATTACK.$" - -gRoarMoveDescription:: @ 86189E7 - .string "Makes the foe flee to end\nthe battle.$" - -gSingMoveDescription:: @ 8618A0D - .string "A soothing song lulls the\nfoe into a deep slumber.$" - -gSupersonicMoveDescription:: @ 8618A40 - .string "Emits bizarre sound waves\nthat may confuse the foe.$" - -gSonicBoomMoveDescription:: @ 8618A74 - .string "Launches shock waves that\nalways inflict 20 HP damage.$" - -gDisableMoveDescription:: @ 8618AAB - .string "Psychically disables one of\nthe foe’s moves.$" - -gAcidMoveDescription:: @ 8618AD8 - .string "Sprays a hide-melting acid.\nMay lower DEFENSE.$" - -gEmberMoveDescription:: @ 8618B07 - .string "A weak fire attack that may\ninflict a burn.$" - -gFlamethrowerMoveDescription:: @ 8618B33 - .string "A powerful fire attack that\nmay inflict a burn.$" - -gMistMoveDescription:: @ 8618B63 - .string "Creates a mist that stops\nreduction of abilities.$" - -gWaterGunMoveDescription:: @ 8618B95 - .string "Squirts water to attack\nthe foe.$" - -gHydroPumpMoveDescription:: @ 8618BB6 - .string "Blasts water at high power\nto strike the foe.$" - -gSurfMoveDescription:: @ 8618BE4 - .string "Creates a huge wave, then\ncrashes it down on the foe.$" - -gIceBeamMoveDescription:: @ 8618C1A - .string "Blasts the foe with an icy\nbeam that may freeze it.$" - -gBlizzardMoveDescription:: @ 8618C4E - .string "Hits the foe with an icy\nstorm that may freeze it.$" - -gPsybeamMoveDescription:: @ 8618C81 - .string "Fires a peculiar ray that\nmay confuse the foe.$" - -gBubbleBeamMoveDescription:: @ 8618CB0 - .string "Forcefully sprays bubbles\nthat may lower SPEED.$" - -gAuroraBeamMoveDescription:: @ 8618CE0 - .string "Fires a rainbow-colored\nbeam that may lower ATTACK.$" - -gHyperBeamMoveDescription:: @ 8618D14 - .string "Powerful, but leaves the\nuser immobile the next turn.$" - -gPeckMoveDescription:: @ 8618D4A - .string "Attacks the foe with a\njabbing beak, etc.$" - -gDrillPeckMoveDescription:: @ 8618D74 - .string "A corkscrewing attack with\nthe beak acting as a drill.$" - -gSubmissionMoveDescription:: @ 8618DAB - .string "A reckless body slam that\nalso hurts the user.$" - -gLowKickMoveDescription:: @ 8618DDA - .string "A kick that inflicts more\ndamage on heavier foes.$" - -gCounterMoveDescription:: @ 8618E0C - .string "Retaliates any physical hit\nwith double the power.$" - -gSeismicTossMoveDescription:: @ 8618E3F - .string "Inflicts damage identical\nto the user’s level.$" - -gStrengthMoveDescription:: @ 8618E6E - .string "Builds enormous power,\nthen slams the foe.$" - -gAbsorbMoveDescription:: @ 8618E99 - .string "An attack that absorbs\nhalf the damage inflicted.$" - -gMegaDrainMoveDescription:: @ 8618ECB - .string "An attack that absorbs\nhalf the damage inflicted.$" - -gLeechSeedMoveDescription:: @ 8618EFD - .string "Plants a seed on the foe to\nsteal HP on every turn.$" - -gGrowthMoveDescription:: @ 8618F31 - .string "Forces the body to grow\nand heightens SP. ATK.$" - -gRazorLeafMoveDescription:: @ 8618F60 - .string "Cuts the enemy with leaves.\nHigh critical-hit ratio.$" - -gSolarBeamMoveDescription:: @ 8618F95 - .string "Absorbs light in one turn,\nthen attacks next turn.$" - -gPoisonPowderMoveDescription:: @ 8618FC8 - .string "Scatters a toxic powder\nthat may poison the foe.$" - -gStunSporeMoveDescription:: @ 8618FF9 - .string "Scatters a powder that may\nparalyze the foe.$" - -gSleepPowderMoveDescription:: @ 8619026 - .string "Scatters a powder that may\ncause the foe to sleep.$" - -gPetalDanceMoveDescription:: @ 8619059 - .string "A rampage of 2 to 3 turns\nthat confuses the user.$" - -gStringShotMoveDescription:: @ 861908B - .string "Binds the foe with string\nto reduce its SPEED.$" - -gDragonRageMoveDescription:: @ 86190BA - .string "Launches shock waves that\nalways inflict 40 HP damage.$" - -gFireSpinMoveDescription:: @ 86190F1 - .string "Traps the foe in a ring of\nfire for 2 to 5 turns.$" - -gThunderShockMoveDescription:: @ 8619123 - .string "An electrical attack that\nmay paralyze the foe.$" - -gThunderboltMoveDescription:: @ 8619153 - .string "A strong electrical attack\nthat may paralyze the foe.$" - -gThunderWaveMoveDescription:: @ 8619189 - .string "A weak jolt of electricity\nthat paralyzes the foe.$" - -gThunderMoveDescription:: @ 86191BC - .string "A lightning attack that may\ncause paralysis.$" - -gRockThrowMoveDescription:: @ 86191E9 - .string "Throws small rocks to\nstrike the foe.$" - -gEarthquakeMoveDescription:: @ 861920F - .string "A powerful quake, but has\nno effect on flying foes.$" - -gFissureMoveDescription:: @ 8619243 - .string "A one-hit KO move that\ndrops the foe in a fissure.$" - -gDigMoveDescription:: @ 8619276 - .string "Digs underground the first\nturn and strikes next turn.$" - -gToxicMoveDescription:: @ 86192AD - .string "Poisons the foe with an\nintensifying toxin.$" - -gConfusionMoveDescription:: @ 86192D9 - .string "A psychic attack that may\ncause confusion.$" - -gPsychicMoveDescription:: @ 8619304 - .string "A powerful psychic attack\nthat may lower SP. DEF.$" - -gHypnosisMoveDescription:: @ 8619336 - .string "A hypnotizing move that\nmay induce sleep.$" - -gMeditateMoveDescription:: @ 8619360 - .string "Meditates in a peaceful\nfashion to raise ATTACK.$" - -gAgilityMoveDescription:: @ 8619391 - .string "Relaxes the body to sharply\nboost SPEED.$" - -gQuickAttackMoveDescription:: @ 86193BA - .string "An extremely fast attack\nthat always strikes first.$" - -gRageMoveDescription:: @ 86193EE - .string "Raises the user’s ATTACK\nevery time it is hit.$" - -gTeleportMoveDescription:: @ 861941D - .string "A psychic move for fleeing\nfrom battle instantly.$" - -gNightShadeMoveDescription:: @ 861944F - .string "Inflicts damage identical\nto the user’s level.$" - -gMimicMoveDescription:: @ 861947E - .string "Copies a move used by the\nfoe during one battle.$" - -gScreechMoveDescription:: @ 86194AF - .string "Emits a screech to sharply\nreduce the foe’s DEFENSE.$" - -gDoubleTeamMoveDescription:: @ 86194E4 - .string "Creates illusory copies to\nraise evasiveness.$" - -gRecoverMoveDescription:: @ 8619512 - .string "Recovers up to half the\nuser’s maximum HP.$" - -gHardenMoveDescription:: @ 861953D - .string "Stiffens the body’s \nmuscles to raise DEFENSE.$" - -gMinimizeMoveDescription:: @ 861956C - .string "Minimizes the user’s size\nto raise evasiveness.$" - -gSmokescreenMoveDescription:: @ 861959C - .string "Lowers the foe’s accuracy\nusing smoke, ink, etc.$" - -gConfuseRayMoveDescription:: @ 86195CD - .string "A sinister ray that\nconfuses the foe.$" - -gWithdrawMoveDescription:: @ 86195F3 - .string "Withdraws the body into its\nhard shell to raise DEFENSE.$" - -gDefenseCurlMoveDescription:: @ 861962C - .string "Curls up to conceal weak\nspots and raise DEFENSE.$" - -gBarrierMoveDescription:: @ 861965E - .string "Creates a barrier that\nsharply raises DEFENSE.$" - -gLightScreenMoveDescription:: @ 861968D - .string "Creates a wall of light that\nlowers SP. ATK damage.$" - -gHazeMoveDescription:: @ 86196C1 - .string "Creates a black haze that\neliminates all stat changes.$" - -gReflectMoveDescription:: @ 86196F8 - .string "Creates a wall of light that\nweakens physical attacks.$" - -gFocusEnergyMoveDescription:: @ 861972F - .string "Focuses power to raise the\ncritical-hit ratio.$" - -gBideMoveDescription:: @ 861975E - .string "Endures attack for 2\nturns to retaliate double.$" - -gMetronomeMoveDescription:: @ 861978E - .string "Waggles a finger to use any\nPOKéMON move at random.$" - -gMirrorMoveMoveDescription:: @ 86197C2 - .string "Counters the foe’s attack\nwith the same move.$" - -gSelfDestructMoveDescription:: @ 86197F0 - .string "Inflicts severe damage but\nmakes the user faint.$" - -gEggBombMoveDescription:: @ 8619821 - .string "An egg is forcibly hurled at\nthe foe.$" - -gLickMoveDescription:: @ 8619847 - .string "Licks with a long tongue to\ninjure. May also paralyze.$" - -gSmogMoveDescription:: @ 861987E - .string "An exhaust-gas attack\nthat may also poison.$" - -gSludgeMoveDescription:: @ 86198AA - .string "Sludge is hurled to inflict\ndamage. May also poison.$" - -gBoneClubMoveDescription:: @ 86198DF - .string "Clubs the foe with a bone.\nMay cause flinching.$" - -gFireBlastMoveDescription:: @ 861990F - .string "Incinerates everything it\nstrikes. May cause a burn.$" - -gWaterfallMoveDescription:: @ 8619944 - .string "Charges the foe with speed\nto climb waterfalls.$" - -gClampMoveDescription:: @ 8619974 - .string "Traps and squeezes the\nfoe for 2 to 5 turns.$" - -gSwiftMoveDescription:: @ 86199A1 - .string "Sprays star-shaped rays\nthat never miss.$" - -gSkullBashMoveDescription:: @ 86199CA - .string "Tucks in the head, then\nattacks on the next turn.$" - -gSpikeCannonMoveDescription:: @ 86199FC - .string "Launches sharp spikes that\nstrike 2 to 5 times.$" - -gConstrictMoveDescription:: @ 8619A2C - .string "Constricts to inflict pain.\nMay lower SPEED.$" - -gAmnesiaMoveDescription:: @ 8619A59 - .string "Forgets about something\nand sharply raises SP. DEF.$" - -gKinesisMoveDescription:: @ 8619A8D - .string "Distracts the foe.\nMay lower accuracy.$" - -gSoftBoiledMoveDescription:: @ 8619AB4 - .string "Recovers up to half the\nuser’s maximum HP.$" - -gHiJumpKickMoveDescription:: @ 8619ADF - .string "A jumping knee kick. If it\nmisses, the user is hurt.$" - -gGlareMoveDescription:: @ 8619B14 - .string "Intimidates and frightens\nthe foe into paralysis.$" - -gDreamEaterMoveDescription:: @ 8619B46 - .string "Takes one half the damage\ninflicted on a sleeping foe.$" - -gPoisonGasMoveDescription:: @ 8619B7D - .string "Envelops the foe in a toxic\ngas that may poison.$" - -gBarrageMoveDescription:: @ 8619BAE - .string "Hurls round objects at the\nfoe 2 to 5 times.$" - -gLeechLifeMoveDescription:: @ 8619BDB - .string "An attack that steals half\nthe damage inflicted.$" - -gLovelyKissMoveDescription:: @ 8619C0C - .string "Demands a kiss with a scary\nface that induces sleep.$" - -gSkyAttackMoveDescription:: @ 8619C41 - .string "Searches out weak spots,\nthen strikes the next turn.$" - -gTransformMoveDescription:: @ 8619C76 - .string "Alters the user’s cells to\nbecome a copy of the foe.$" - -gBubbleMoveDescription:: @ 8619CAB - .string "An attack using bubbles.\nMay lower the foe’s SPEED.$" - -gDizzyPunchMoveDescription:: @ 8619CDF - .string "A rhythmic punch that may\nconfuse the foe.$" - -gSporeMoveDescription:: @ 8619D0A - .string "Scatters a cloud of spores\nthat always induce sleep.$" - -gFlashMoveDescription:: @ 8619D3F - .string "Looses a powerful blast of\nlight that cuts accuracy.$" - -gPsywaveMoveDescription:: @ 8619D74 - .string "Attacks with a psychic\nwave of varying intensity.$" - -gSplashMoveDescription:: @ 8619DA6 - .string "It’s just a splash...\nHas no effect whatsoever.$" - -gAcidArmorMoveDescription:: @ 8619DD6 - .string "Liquifies the user’s body\nto sharply raise DEFENSE.$" - -gCrabhammerMoveDescription:: @ 8619E0A - .string "Hammers with a pincer. Has a\nhigh critical-hit ratio.$" - -gExplosionMoveDescription:: @ 8619E40 - .string "Inflicts severe damage but\nmakes the user faint.$" - -gFurySwipesMoveDescription:: @ 8619E71 - .string "Rakes the foe with sharp\nclaws, etc., 2 to 5 times.$" - -gBonemerangMoveDescription:: @ 8619EA5 - .string "Throws a bone boomerang\nthat strikes twice.$" - -gRestMoveDescription:: @ 8619ED1 - .string "The user sleeps for 2 turns,\nrestoring HP and status.$" - -gRockSlideMoveDescription:: @ 8619F07 - .string "Large boulders are hurled.\nMay cause flinching.$" - -gHyperFangMoveDescription:: @ 8619F37 - .string "Attacks with sharp fangs.\nMay cause flinching.$" - -gSharpenMoveDescription:: @ 8619F66 - .string "Reduces the polygon count\nand raises ATTACK.$" - -gConversionMoveDescription:: @ 8619F93 - .string "Changes the user’s type\ninto a known move’s type.$" - -gTriAttackMoveDescription:: @ 8619FC5 - .string "Fires three types of beams\nat the same time.$" - -gSuperFangMoveDescription:: @ 8619FF2 - .string "Attacks with sharp fangs\nand cuts half the foe’s HP.$" - -gSlashMoveDescription:: @ 861A027 - .string "Slashes with claws, etc. Has\na high critical-hit ratio.$" - -gSubstituteMoveDescription:: @ 861A05F - .string "Creates a decoy using 1/4\nof the user’s maximum HP.$" - -gStruggleMoveDescription:: @ 861A093 - .string "Used only if all PP are gone.\nAlso hurts the user a little.$" - -gSketchMoveDescription:: @ 861A0CF - .string "Copies the foe’s last move\npermanently.$" - -gTripleKickMoveDescription:: @ 861A0F7 - .string "Kicks the foe 3 times in a\nrow with rising intensity.$" - -gThiefMoveDescription:: @ 861A12D - .string "While attacking, it may\nsteal the foe’s held item.$" - -gSpiderWebMoveDescription:: @ 861A160 - .string "Ensnares the foe to stop it\nfrom fleeing or switching.$" - -gMindReaderMoveDescription:: @ 861A197 - .string "Senses the foe’s action to\nensure the next move’s hit.$" - -gNightmareMoveDescription:: @ 861A1CE - .string "Inflicts 1/4 damage on a\nsleeping foe every turn.$" - -gFlameWheelMoveDescription:: @ 861A200 - .string "A fiery charge attack that\nmay inflict a burn.$" - -gSnoreMoveDescription:: @ 861A22F - .string "A loud attack that can be\nused only while asleep.$" - -gCurseMoveDescription:: @ 861A261 - .string "A move that functions\ndifferently for GHOSTS.$" - -gFlailMoveDescription:: @ 861A28F - .string "Inflicts more damage when\nthe user’s HP is down.$" - -gConversion2MoveDescription:: @ 861A2C0 - .string "Makes the user resistant\nto the last attack’s type.$" - -gAeroblastMoveDescription:: @ 861A2F4 - .string "Launches a vacuumed blast.\nHigh critical-hit ratio.$" - -gCottonSporeMoveDescription:: @ 861A328 - .string "Spores cling to the foe,\nsharply reducing SPEED.$" - -gReversalMoveDescription:: @ 861A359 - .string "Inflicts more damage when\nthe user’s HP is down.$" - -gSpiteMoveDescription:: @ 861A38A - .string "Spitefully cuts the PP\nof the foe’s last move.$" - -gPowderSnowMoveDescription:: @ 861A3B9 - .string "Blasts the foe with a snowy\ngust. May cause freezing.$" - -gProtectMoveDescription:: @ 861A3EF - .string "Evades attack, but may fail\nif used in succession.$" - -gMachPunchMoveDescription:: @ 861A422 - .string "A punch is thrown at wicked\nspeed to strike first.$" - -gScaryFaceMoveDescription:: @ 861A455 - .string "Frightens with a scary face\nto sharply reduce SPEED.$" - -gFaintAttackMoveDescription:: @ 861A48A - .string "Draws the foe close, then\nstrikes without fail.$" - -gSweetKissMoveDescription:: @ 861A4BA - .string "Demands a kiss with a cute\nlook. May cause confusion.$" - -gBellyDrumMoveDescription:: @ 861A4F0 - .string "Maximizes ATTACK while\nsacrificing HP.$" - -gSludgeBombMoveDescription:: @ 861A517 - .string "Sludge is hurled to inflict\ndamage. May also poison.$" - -gMudSlapMoveDescription:: @ 861A54C - .string "Hurls mud in the foe’s face\nto reduce its accuracy.$" - -gOctazookaMoveDescription:: @ 861A580 - .string "Fires a lump of ink to\ndamage and cut accuracy.$" - -gSpikesMoveDescription:: @ 861A5B0 - .string "Sets spikes that hurt a \nfoe switching in.$" - -gZapCannonMoveDescription:: @ 861A5DB - .string "Powerful and sure to cause\nparalysis, but inaccurate.$" - -gForesightMoveDescription:: @ 861A611 - .string "Negates the foe’s efforts\nto heighten evasiveness.$" - -gDestinyBondMoveDescription:: @ 861A644 - .string "If the user faints, the foe\nis also made to faint.$" - -gPerishSongMoveDescription:: @ 861A677 - .string "Any POKéMON hearing this\nsong faints in 3 turns.$" - -gIcyWindMoveDescription:: @ 861A6A8 - .string "A chilling attack that\nlowers the foe’s SPEED.$" - -gDetectMoveDescription:: @ 861A6D7 - .string "Evades attack, but may fail\nif used in succession.$" - -gBoneRushMoveDescription:: @ 861A70A - .string "Strikes the foe with a bone\nin hand 2 to 5 times.$" - -gLockOnMoveDescription:: @ 861A73C - .string "Locks on to the foe to\nensure the next move hits.$" - -gOutrageMoveDescription:: @ 861A76E - .string "A rampage of 2 to 3 turns\nthat confuses the user.$" - -gSandstormMoveDescription:: @ 861A7A0 - .string "Causes a sandstorm that\nrages for several turns.$" - -gGigaDrainMoveDescription:: @ 861A7D1 - .string "An attack that steals half\nthe damage inflicted.$" - -gEndureMoveDescription:: @ 861A802 - .string "Endures any attack for\n1 turn, leaving at least 1HP.$" - -gCharmMoveDescription:: @ 861A837 - .string "Charms the foe and sharply\nreduces its ATTACK.$" - -gRolloutMoveDescription:: @ 861A866 - .string "An attack lasting 5 turns\nwith rising intensity.$" - -gFalseSwipeMoveDescription:: @ 861A897 - .string "An attack that leaves the\nfoe with at least 1 HP.$" - -gSwaggerMoveDescription:: @ 861A8C9 - .string "Confuses the foe, but also\nsharply raises ATTACK.$" - -gMilkDrinkMoveDescription:: @ 861A8FB - .string "Recovers up to half the\nuser’s maximum HP.$" - -gSparkMoveDescription:: @ 861A926 - .string "An electrified tackle that\nmay paralyze the foe.$" - -gFuryCutterMoveDescription:: @ 861A957 - .string "An attack that intensifies\non each successive hit.$" - -gSteelWingMoveDescription:: @ 861A98A - .string "Strikes the foe with hard\nwings spread wide.$" - -gMeanLookMoveDescription:: @ 861A9B7 - .string "Fixes the foe with a mean\nlook that prevents escape.$" - -gAttractMoveDescription:: @ 861A9EC - .string "Makes the opposite gender\nless likely to attack.$" - -gSleepTalkMoveDescription:: @ 861AA1D - .string "Uses an available move\nrandomly while asleep.$" - -gHealBellMoveDescription:: @ 861AA4B - .string "Chimes soothingly to heal\nall status abnormalities.$" - -gReturnMoveDescription:: @ 861AA7F - .string "An attack that increases\nin power with friendship.$" - -gPresentMoveDescription:: @ 861AAB2 - .string "A gift in the form of a\nbomb. May restore HP.$" - -gFrustrationMoveDescription:: @ 861AAE0 - .string "An attack that is stronger\nif the TRAINER is disliked.$" - -gSafeguardMoveDescription:: @ 861AB17 - .string "A mystical force prevents\nall status problems.$" - -gPainSplitMoveDescription:: @ 861AB46 - .string "Adds the user and foe’s HP,\nthen shares them equally.$" - -gSacredFireMoveDescription:: @ 861AB7C - .string "A mystical fire attack that\nmay inflict a burn.$" - -gMagnitudeMoveDescription:: @ 861ABAC - .string "A ground-shaking attack\nof random intensity.$" - -gDynamicPunchMoveDescription:: @ 861ABD9 - .string "Powerful and sure to cause\nconfusion, but inaccurate.$" - -gMegahornMoveDescription:: @ 861AC0F - .string "A brutal ramming attack\nusing out-thrust horns.$" - -gDragonBreathMoveDescription:: @ 861AC3F - .string "Strikes the foe with an\nincredible blast of breath.$" - -gBatonPassMoveDescription:: @ 861AC73 - .string "Switches out the user while\nkeeping effects in play.$" - -gEncoreMoveDescription:: @ 861ACA8 - .string "Makes the foe repeat its\nlast move over 2 to 6 turns.$" - -gPursuitMoveDescription:: @ 861ACDE - .string "Inflicts bad damage if used\non a foe switching out.$" - -gRapidSpinMoveDescription:: @ 861AD12 - .string "Spins the body at high\nspeed to strike the foe.$" - -gSweetScentMoveDescription:: @ 861AD42 - .string "Allures the foe to reduce\nevasiveness.$" - -gIronTailMoveDescription:: @ 861AD69 - .string "Attacks with a rock-hard\ntail. May lower DEFENSE.$" - -gMetalClawMoveDescription:: @ 861AD9B - .string "A claw attack that may\nraise the user’s ATTACK.$" - -gVitalThrowMoveDescription:: @ 861ADCB - .string "Makes the user’s move last,\nbut it never misses.$" - -gMorningSunMoveDescription:: @ 861ADFC - .string "Restores HP. The amount\nvaries with the weather.$" - -gSynthesisMoveDescription:: @ 861AE2D - .string "Restores HP. The amount\nvaries with the weather.$" - -gMoonlightMoveDescription:: @ 861AE5E - .string "Restores HP. The amount\nvaries with the weather.$" - -gHiddenPowerMoveDescription:: @ 861AE8F - .string "The effectiveness varies\nwith the user.$" - -gCrossChopMoveDescription:: @ 861AEB7 - .string "A double-chopping attack.\nHigh critical-hit ratio.$" - -gTwisterMoveDescription:: @ 861AEEA - .string "Whips up a vicious twister\nto tear at the foe.$" - -gRainDanceMoveDescription:: @ 861AF19 - .string "Boosts the power of WATER-\ntype moves for 5 turns.$" - -gSunnyDayMoveDescription:: @ 861AF4C - .string "Boosts the power of FIRE-\ntype moves for 5 turns.$" - -gCrunchMoveDescription:: @ 861AF7E - .string "Crunches with sharp fangs.\nMay lower SP. DEF.$" - -gMirrorCoatMoveDescription:: @ 861AFAC - .string "Counters the foe’s special\nattack at double the power.$" - -gPsychUpMoveDescription:: @ 861AFE3 - .string "Copies the foe’s effect(s)\nand gives to the user.$" - -gExtremeSpeedMoveDescription:: @ 861B015 - .string "An extremely fast and\npowerful attack.$" - -gAncientPowerMoveDescription:: @ 861B03C - .string "An attack that may raise\nall stats.$" - -gShadowBallMoveDescription:: @ 861B060 - .string "Hurls a black blob that may\nlower the foe’s SP. DEF.$" - -gFutureSightMoveDescription:: @ 861B095 - .string "Heightens inner power to\nstrike 2 turns later.$" - -gRockSmashMoveDescription:: @ 861B0C4 - .string "A rock-crushing attack\nthat may lower DEFENSE.$" - -gWhirlpoolMoveDescription:: @ 861B0F3 - .string "Traps and hurts the foe in\na whirlpool for 2 to 5 turns.$" - -gBeatUpMoveDescription:: @ 861B12C - .string "Summons party POKéMON to\njoin in the attack.$" - -gFakeOutMoveDescription:: @ 861B159 - .string "A 1st-turn, 1st-strike move\nthat causes flinching.$" - -gUproarMoveDescription:: @ 861B18C - .string "Causes an uproar for 2 to 5\nturns and prevents sleep.$" - -gStockpileMoveDescription:: @ 861B1C2 - .string "Charges up power for up to\n3 turns.$" - -gSpitUpMoveDescription:: @ 861B1E6 - .string "Releases stockpiled power\n(the more the better).$" - -gSwallowMoveDescription:: @ 861B217 - .string "Absorbs stockpiled power\nand restores HP.$" - -gHeatWaveMoveDescription:: @ 861B241 - .string "Exhales a hot breath on the\nfoe. May inflict a burn.$" - -gHailMoveDescription:: @ 861B276 - .string "Summons a hailstorm that\nstrikes every turn.$" - -gTormentMoveDescription:: @ 861B2A3 - .string "Torments the foe and stops\nsuccessive use of a move.$" - -gFlatterMoveDescription:: @ 861B2D8 - .string "Confuses the foe, but\nraises its SP. ATK.$" - -gWillOWispMoveDescription:: @ 861B302 - .string "Inflicts a burn on the foe\nwith intense fire.$" - -gMementoMoveDescription:: @ 861B330 - .string "The user faints and lowers\nthe foe’s abilities.$" - -gFacadeMoveDescription:: @ 861B360 - .string "Boosts ATTACK when burned,\nparalyzed, or poisoned.$" - -gFocusPunchMoveDescription:: @ 861B393 - .string "A powerful loyalty attack.\nThe user flinches if hit.$" - -gSmellingSaltMoveDescription:: @ 861B3C8 - .string "Powerful against paralyzed\nfoes, but also heals them.$" - -gFollowMeMoveDescription:: @ 861B3FE - .string "Draws attention to make\nfoes attack only the user.$" - -gNaturePowerMoveDescription:: @ 861B431 - .string "The type of attack varies\ndepending on the location.$" - -gChargeMoveDescription:: @ 861B466 - .string "Charges power to boost the\nelectric move used next.$" - -gTauntMoveDescription:: @ 861B49A - .string "Taunts the foe into only\nusing attack moves.$" - -gHelpingHandMoveDescription:: @ 861B4C7 - .string "Boosts the power of the\nrecipient’s moves.$" - -gTrickMoveDescription:: @ 861B4F2 - .string "Tricks the foe into trading\nheld items.$" - -gRolePlayMoveDescription:: @ 861B51A - .string "Mimics the target and\ncopies its special ability.$" - -gWishMoveDescription:: @ 861B54C - .string "A wish that restores HP.\nIt takes time to work.$" - -gAssistMoveDescription:: @ 861B57C - .string "Attacks randomly with one\nof the partner’s moves.$" - -gIngrainMoveDescription:: @ 861B5AE - .string "Lays roots that restore HP.\nThe user can’t switch out.$" - -gSuperpowerMoveDescription:: @ 861B5E5 - .string "Boosts strength sharply,\nbut lowers abilities.$" - -gMagicCoatMoveDescription:: @ 861B614 - .string "Reflects special effects\nback to the attacker.$" - -gRecycleMoveDescription:: @ 861B643 - .string "Recycles a used item for\none more use.$" - -gRevengeMoveDescription:: @ 861B66A - .string "An attack that gains power\nif injured by the foe.$" - -gBrickBreakMoveDescription:: @ 861B69C - .string "Destroys barriers such as\nREFLECT and causes damage.$" - -gYawnMoveDescription:: @ 861B6D1 - .string "Lulls the foe into yawning,\nthen sleeping next turn.$" - -gKnockOffMoveDescription:: @ 861B706 - .string "Knocks down the foe’s held\nitem to prevent its use.$" - -gEndeavorMoveDescription:: @ 861B73A - .string "Gains power if the user’s HP\nis lower than the foe’s HP.$" - -gEruptionMoveDescription:: @ 861B773 - .string "The higher the user’s HP,\nthe more damage caused.$" - -gSkillSwapMoveDescription:: @ 861B7A5 - .string "The user swaps special\nabilities with the target.$" - -gImprisonMoveDescription:: @ 861B7D7 - .string "Prevents foes from using\nmoves known by the user.$" - -gRefreshMoveDescription:: @ 861B809 - .string "Heals poisoning, paralysis,\nor a burn.$" - -gGrudgeMoveDescription:: @ 861B830 - .string "If the user faints, deletes\nall PP of foe’s last move.$" - -gSnatchMoveDescription:: @ 861B867 - .string "Steals the effects of the\nmove the target uses next.$" - -gSecretPowerMoveDescription:: @ 861B89C - .string "An attack with effects\nthat vary by location.$" - -gDiveMoveDescription:: @ 861B8CA - .string "Dives underwater the first\nturn and strikes next turn.$" - -gArmThrustMoveDescription:: @ 861B901 - .string "Straight-arm punches that\nstrike the foe 2 to 5 times.$" - -gCamouflageMoveDescription:: @ 861B938 - .string "Alters the POKéMON’s type\ndepending on the location.$" - -gTailGlowMoveDescription:: @ 861B96D - .string "Flashes a light that sharply\nraises SP. ATK.$" - -gLusterPurgeMoveDescription:: @ 861B99A - .string "Attacks with a burst of\nlight. May lower SP. DEF.$" - -gMistBallMoveDescription:: @ 861B9CC - .string "Attacks with a flurry of\ndown. May lower SP. ATK.$" - -gFeatherDanceMoveDescription:: @ 861B9FE - .string "Envelops the foe with down\nto sharply reduce ATTACK.$" - -gTeeterDanceMoveDescription:: @ 861BA33 - .string "Confuses all POKéMON on\nthe scene.$" - -gBlazeKickMoveDescription:: @ 861BA56 - .string "A kick with a high critical-\nhit ratio. May cause a burn.$" - -gMudSportMoveDescription:: @ 861BA90 - .string "Covers the user in mud to\nraise electrical resistance.$" - -gIceBallMoveDescription:: @ 861BAC7 - .string "A 5-turn attack that gains\npower on successive hits.$" - -gNeedleArmMoveDescription:: @ 861BAFC - .string "Attacks with thorny arms.\nMay cause flinching.$" - -gSlackOffMoveDescription:: @ 861BB2B - .string "Slacks off and restores\nhalf the maximum HP.$" - -gHyperVoiceMoveDescription:: @ 861BB58 - .string "A loud attack that uses\nsound waves to injure.$" - -gPoisonFangMoveDescription:: @ 861BB87 - .string "A sharp-fanged attack.\nMay badly poison the foe.$" - -gCrushClawMoveDescription:: @ 861BBB8 - .string "Tears at the foe with sharp\nclaws. May lower DEFENSE.$" - -gBlastBurnMoveDescription:: @ 861BBEE - .string "Powerful, but leaves the\nuser immobile the next turn.$" - -gHydroCannonMoveDescription:: @ 861BC24 - .string "Powerful, but leaves the\nuser immobile the next turn.$" - -gMeteorMashMoveDescription:: @ 861BC5A - .string "Fires a meteor-like punch.\nMay raise ATTACK.$" - -gAstonishMoveDescription:: @ 861BC87 - .string "An attack that may shock\nthe foe into flinching.$" - -gWeatherBallMoveDescription:: @ 861BCB8 - .string "The move’s type and power\nchange with the weather.$" - -gAromatherapyMoveDescription:: @ 861BCEB - .string "Heals all status problems\nwith a soothing scent.$" - -gFakeTearsMoveDescription:: @ 861BD1C - .string "Feigns crying to sharply\nlower the foe’s SP. DEF.$" - -gAirCutterMoveDescription:: @ 861BD4E - .string "Hacks with razorlike wind.\nHigh critical-hit ratio.$" - -gOverheatMoveDescription:: @ 861BD82 - .string "Allows a full-power attack,\nbut sharply lowers SP. ATK.$" - -gOdorSleuthMoveDescription:: @ 861BDBA - .string "Negates the foe’s efforts\nto heighten evasiveness.$" - -gRockTombMoveDescription:: @ 861BDED - .string "Stops the foe from moving\nwith rocks and cuts SPEED.$" - -gSilverWindMoveDescription:: @ 861BE22 - .string "A powdery attack that may\nraise abilities.$" - -gMetalSoundMoveDescription:: @ 861BE4D - .string "Emits a horrible screech\nthat sharply lowers SP. DEF.$" - -gGrassWhistleMoveDescription:: @ 861BE83 - .string "Lulls the foe into sleep\nwith a pleasant melody.$" - -gTickleMoveDescription:: @ 861BEB4 - .string "Makes the foe laugh to\nlower ATTACK and DEFENSE.$" - -gCosmicPowerMoveDescription:: @ 861BEE5 - .string "Raises DEFENSE and SP. DEF\nwith a mystic power.$" - -gWaterSpoutMoveDescription:: @ 861BF15 - .string "Inflicts more damage if the\nuser’s HP is high.$" - -gSignalBeamMoveDescription:: @ 861BF44 - .string "A strange beam attack that\nmay confuse the foe.$" - -gShadowPunchMoveDescription:: @ 861BF74 - .string "An unavoidable punch that\nis thrown from shadows.$" - -gExtrasensoryMoveDescription:: @ 861BFA6 - .string "Attacks with a peculiar\npower. May cause flinching.$" - -gSkyUppercutMoveDescription:: @ 861BFDA - .string "An uppercut thrown as if\nleaping into the sky.$" - -gSandTombMoveDescription:: @ 861C009 - .string "Traps and hurts the foe in\nquicksand for 2 to 5 turns.$" - -gSheerColdMoveDescription:: @ 861C040 - .string "A chilling attack that\ncauses fainting if it hits.$" - -gMuddyWaterMoveDescription:: @ 861C073 - .string "Attacks with muddy water.\nMay lower accuracy.$" - -gBulletSeedMoveDescription:: @ 861C0A1 - .string "Shoots 2 to 5 seeds in a row\nto strike the foe.$" - -gAerialAceMoveDescription:: @ 861C0D1 - .string "An extremely speedy and\nunavoidable attack.$" - -gIcicleSpearMoveDescription:: @ 861C0FD - .string "Attacks the foe by firing\n2 to 5 icicles in a row.$" - -gIronDefenseMoveDescription:: @ 861C130 - .string "Hardens the body’s surface\nto sharply raise DEFENSE.$" - -gBlockMoveDescription:: @ 861C165 - .string "Blocks the foe’s way to\nprevent escape.$" - -gHowlMoveDescription:: @ 861C18D - .string "Howls to raise the spirit\nand boosts ATTACK.$" - -gDragonClawMoveDescription:: @ 861C1BA - .string "Slashes the foe with sharp\nclaws.$" - -gFrenzyPlantMoveDescription:: @ 861C1DC - .string "Powerful, but leaves the\nuser immobile the next turn.$" - -gBulkUpMoveDescription:: @ 861C212 - .string "Bulks up the body to boost\nboth ATTACK and DEFENSE.$" - -gBounceMoveDescription:: @ 861C246 - .string "Bounces up, then down the\nnext turn. May paralyze.$" - -gMudShotMoveDescription:: @ 861C279 - .string "Hurls mud at the foe and\nreduces SPEED.$" - -gPoisonTailMoveDescription:: @ 861C2A1 - .string "Has a high critical-hit\nratio. May also poison.$" - -gCovetMoveDescription:: @ 861C2D1 - .string "Cutely begs to obtain an\nitem held by the foe.$" - -gVoltTackleMoveDescription:: @ 861C300 - .string "A life-risking tackle that\nslightly hurts the user.$" - -gMagicalLeafMoveDescription:: @ 861C334 - .string "Attacks with a strange leaf\nthat cannot be evaded.$" - -gWaterSportMoveDescription:: @ 861C367 - .string "The user becomes soaked to\nraise resistance to fire.$" - -gCalmMindMoveDescription:: @ 861C39C - .string "Raises SP. ATK and SP. DEF\nby focusing the mind.$" - -gLeafBladeMoveDescription:: @ 861C3CD - .string "Slashes with a sharp leaf.\nHigh critical-hit ratio.$" - -gDragonDanceMoveDescription:: @ 861C401 - .string "A mystical dance that ups\nATTACK and SPEED.$" - -gRockBlastMoveDescription:: @ 861C42D - .string "Hurls boulders at the foe\n2 to 5 times in a row.$" - -gShockWaveMoveDescription:: @ 861C45E - .string "A fast and unavoidable\nelectric attack.$" - -gWaterPulseMoveDescription:: @ 861C486 - .string "Attacks with ultrasonic\nwaves. May confuse the foe.$" - -gDoomDesireMoveDescription:: @ 861C4BA - .string "Summons strong sunlight to\nattack 2 turns later.$" - -gPsychoBoostMoveDescription:: @ 861C4EB - .string "Allows a full-power attack,\nbut sharply lowers SP. ATK.$" - - .align 2 -gMoveDescriptionPointers:: @ 861C524 - .4byte gPoundMoveDescription - .4byte gKarateChopMoveDescription - .4byte gDoubleSlapMoveDescription - .4byte gCometPunchMoveDescription - .4byte gMegaPunchMoveDescription - .4byte gPayDayMoveDescription - .4byte gFirePunchMoveDescription - .4byte gIcePunchMoveDescription - .4byte gThunderPunchMoveDescription - .4byte gScratchMoveDescription - .4byte gViceGripMoveDescription - .4byte gGuillotineMoveDescription - .4byte gRazorWindMoveDescription - .4byte gSwordsDanceMoveDescription - .4byte gCutMoveDescription - .4byte gGustMoveDescription - .4byte gWingAttackMoveDescription - .4byte gWhirlwindMoveDescription - .4byte gFlyMoveDescription - .4byte gBindMoveDescription - .4byte gSlamMoveDescription - .4byte gVineWhipMoveDescription - .4byte gStompMoveDescription - .4byte gDoubleKickMoveDescription - .4byte gMegaKickMoveDescription - .4byte gJumpKickMoveDescription - .4byte gRollingKickMoveDescription - .4byte gSandAttackMoveDescription - .4byte gHeadbuttMoveDescription - .4byte gHornAttackMoveDescription - .4byte gFuryAttackMoveDescription - .4byte gHornDrillMoveDescription - .4byte gTackleMoveDescription - .4byte gBodySlamMoveDescription - .4byte gWrapMoveDescription - .4byte gTakeDownMoveDescription - .4byte gThrashMoveDescription - .4byte gDoubleEdgeMoveDescription - .4byte gTailWhipMoveDescription - .4byte gPoisonStingMoveDescription - .4byte gTwineedleMoveDescription - .4byte gPinMissileMoveDescription - .4byte gLeerMoveDescription - .4byte gBiteMoveDescription - .4byte gGrowlMoveDescription - .4byte gRoarMoveDescription - .4byte gSingMoveDescription - .4byte gSupersonicMoveDescription - .4byte gSonicBoomMoveDescription - .4byte gDisableMoveDescription - .4byte gAcidMoveDescription - .4byte gEmberMoveDescription - .4byte gFlamethrowerMoveDescription - .4byte gMistMoveDescription - .4byte gWaterGunMoveDescription - .4byte gHydroPumpMoveDescription - .4byte gSurfMoveDescription - .4byte gIceBeamMoveDescription - .4byte gBlizzardMoveDescription - .4byte gPsybeamMoveDescription - .4byte gBubbleBeamMoveDescription - .4byte gAuroraBeamMoveDescription - .4byte gHyperBeamMoveDescription - .4byte gPeckMoveDescription - .4byte gDrillPeckMoveDescription - .4byte gSubmissionMoveDescription - .4byte gLowKickMoveDescription - .4byte gCounterMoveDescription - .4byte gSeismicTossMoveDescription - .4byte gStrengthMoveDescription - .4byte gAbsorbMoveDescription - .4byte gMegaDrainMoveDescription - .4byte gLeechSeedMoveDescription - .4byte gGrowthMoveDescription - .4byte gRazorLeafMoveDescription - .4byte gSolarBeamMoveDescription - .4byte gPoisonPowderMoveDescription - .4byte gStunSporeMoveDescription - .4byte gSleepPowderMoveDescription - .4byte gPetalDanceMoveDescription - .4byte gStringShotMoveDescription - .4byte gDragonRageMoveDescription - .4byte gFireSpinMoveDescription - .4byte gThunderShockMoveDescription - .4byte gThunderboltMoveDescription - .4byte gThunderWaveMoveDescription - .4byte gThunderMoveDescription - .4byte gRockThrowMoveDescription - .4byte gEarthquakeMoveDescription - .4byte gFissureMoveDescription - .4byte gDigMoveDescription - .4byte gToxicMoveDescription - .4byte gConfusionMoveDescription - .4byte gPsychicMoveDescription - .4byte gHypnosisMoveDescription - .4byte gMeditateMoveDescription - .4byte gAgilityMoveDescription - .4byte gQuickAttackMoveDescription - .4byte gRageMoveDescription - .4byte gTeleportMoveDescription - .4byte gNightShadeMoveDescription - .4byte gMimicMoveDescription - .4byte gScreechMoveDescription - .4byte gDoubleTeamMoveDescription - .4byte gRecoverMoveDescription - .4byte gHardenMoveDescription - .4byte gMinimizeMoveDescription - .4byte gSmokescreenMoveDescription - .4byte gConfuseRayMoveDescription - .4byte gWithdrawMoveDescription - .4byte gDefenseCurlMoveDescription - .4byte gBarrierMoveDescription - .4byte gLightScreenMoveDescription - .4byte gHazeMoveDescription - .4byte gReflectMoveDescription - .4byte gFocusEnergyMoveDescription - .4byte gBideMoveDescription - .4byte gMetronomeMoveDescription - .4byte gMirrorMoveMoveDescription - .4byte gSelfDestructMoveDescription - .4byte gEggBombMoveDescription - .4byte gLickMoveDescription - .4byte gSmogMoveDescription - .4byte gSludgeMoveDescription - .4byte gBoneClubMoveDescription - .4byte gFireBlastMoveDescription - .4byte gWaterfallMoveDescription - .4byte gClampMoveDescription - .4byte gSwiftMoveDescription - .4byte gSkullBashMoveDescription - .4byte gSpikeCannonMoveDescription - .4byte gConstrictMoveDescription - .4byte gAmnesiaMoveDescription - .4byte gKinesisMoveDescription - .4byte gSoftBoiledMoveDescription - .4byte gHiJumpKickMoveDescription - .4byte gGlareMoveDescription - .4byte gDreamEaterMoveDescription - .4byte gPoisonGasMoveDescription - .4byte gBarrageMoveDescription - .4byte gLeechLifeMoveDescription - .4byte gLovelyKissMoveDescription - .4byte gSkyAttackMoveDescription - .4byte gTransformMoveDescription - .4byte gBubbleMoveDescription - .4byte gDizzyPunchMoveDescription - .4byte gSporeMoveDescription - .4byte gFlashMoveDescription - .4byte gPsywaveMoveDescription - .4byte gSplashMoveDescription - .4byte gAcidArmorMoveDescription - .4byte gCrabhammerMoveDescription - .4byte gExplosionMoveDescription - .4byte gFurySwipesMoveDescription - .4byte gBonemerangMoveDescription - .4byte gRestMoveDescription - .4byte gRockSlideMoveDescription - .4byte gHyperFangMoveDescription - .4byte gSharpenMoveDescription - .4byte gConversionMoveDescription - .4byte gTriAttackMoveDescription - .4byte gSuperFangMoveDescription - .4byte gSlashMoveDescription - .4byte gSubstituteMoveDescription - .4byte gStruggleMoveDescription - .4byte gSketchMoveDescription - .4byte gTripleKickMoveDescription - .4byte gThiefMoveDescription - .4byte gSpiderWebMoveDescription - .4byte gMindReaderMoveDescription - .4byte gNightmareMoveDescription - .4byte gFlameWheelMoveDescription - .4byte gSnoreMoveDescription - .4byte gCurseMoveDescription - .4byte gFlailMoveDescription - .4byte gConversion2MoveDescription - .4byte gAeroblastMoveDescription - .4byte gCottonSporeMoveDescription - .4byte gReversalMoveDescription - .4byte gSpiteMoveDescription - .4byte gPowderSnowMoveDescription - .4byte gProtectMoveDescription - .4byte gMachPunchMoveDescription - .4byte gScaryFaceMoveDescription - .4byte gFaintAttackMoveDescription - .4byte gSweetKissMoveDescription - .4byte gBellyDrumMoveDescription - .4byte gSludgeBombMoveDescription - .4byte gMudSlapMoveDescription - .4byte gOctazookaMoveDescription - .4byte gSpikesMoveDescription - .4byte gZapCannonMoveDescription - .4byte gForesightMoveDescription - .4byte gDestinyBondMoveDescription - .4byte gPerishSongMoveDescription - .4byte gIcyWindMoveDescription - .4byte gDetectMoveDescription - .4byte gBoneRushMoveDescription - .4byte gLockOnMoveDescription - .4byte gOutrageMoveDescription - .4byte gSandstormMoveDescription - .4byte gGigaDrainMoveDescription - .4byte gEndureMoveDescription - .4byte gCharmMoveDescription - .4byte gRolloutMoveDescription - .4byte gFalseSwipeMoveDescription - .4byte gSwaggerMoveDescription - .4byte gMilkDrinkMoveDescription - .4byte gSparkMoveDescription - .4byte gFuryCutterMoveDescription - .4byte gSteelWingMoveDescription - .4byte gMeanLookMoveDescription - .4byte gAttractMoveDescription - .4byte gSleepTalkMoveDescription - .4byte gHealBellMoveDescription - .4byte gReturnMoveDescription - .4byte gPresentMoveDescription - .4byte gFrustrationMoveDescription - .4byte gSafeguardMoveDescription - .4byte gPainSplitMoveDescription - .4byte gSacredFireMoveDescription - .4byte gMagnitudeMoveDescription - .4byte gDynamicPunchMoveDescription - .4byte gMegahornMoveDescription - .4byte gDragonBreathMoveDescription - .4byte gBatonPassMoveDescription - .4byte gEncoreMoveDescription - .4byte gPursuitMoveDescription - .4byte gRapidSpinMoveDescription - .4byte gSweetScentMoveDescription - .4byte gIronTailMoveDescription - .4byte gMetalClawMoveDescription - .4byte gVitalThrowMoveDescription - .4byte gMorningSunMoveDescription - .4byte gSynthesisMoveDescription - .4byte gMoonlightMoveDescription - .4byte gHiddenPowerMoveDescription - .4byte gCrossChopMoveDescription - .4byte gTwisterMoveDescription - .4byte gRainDanceMoveDescription - .4byte gSunnyDayMoveDescription - .4byte gCrunchMoveDescription - .4byte gMirrorCoatMoveDescription - .4byte gPsychUpMoveDescription - .4byte gExtremeSpeedMoveDescription - .4byte gAncientPowerMoveDescription - .4byte gShadowBallMoveDescription - .4byte gFutureSightMoveDescription - .4byte gRockSmashMoveDescription - .4byte gWhirlpoolMoveDescription - .4byte gBeatUpMoveDescription - .4byte gFakeOutMoveDescription - .4byte gUproarMoveDescription - .4byte gStockpileMoveDescription - .4byte gSpitUpMoveDescription - .4byte gSwallowMoveDescription - .4byte gHeatWaveMoveDescription - .4byte gHailMoveDescription - .4byte gTormentMoveDescription - .4byte gFlatterMoveDescription - .4byte gWillOWispMoveDescription - .4byte gMementoMoveDescription - .4byte gFacadeMoveDescription - .4byte gFocusPunchMoveDescription - .4byte gSmellingSaltMoveDescription - .4byte gFollowMeMoveDescription - .4byte gNaturePowerMoveDescription - .4byte gChargeMoveDescription - .4byte gTauntMoveDescription - .4byte gHelpingHandMoveDescription - .4byte gTrickMoveDescription - .4byte gRolePlayMoveDescription - .4byte gWishMoveDescription - .4byte gAssistMoveDescription - .4byte gIngrainMoveDescription - .4byte gSuperpowerMoveDescription - .4byte gMagicCoatMoveDescription - .4byte gRecycleMoveDescription - .4byte gRevengeMoveDescription - .4byte gBrickBreakMoveDescription - .4byte gYawnMoveDescription - .4byte gKnockOffMoveDescription - .4byte gEndeavorMoveDescription - .4byte gEruptionMoveDescription - .4byte gSkillSwapMoveDescription - .4byte gImprisonMoveDescription - .4byte gRefreshMoveDescription - .4byte gGrudgeMoveDescription - .4byte gSnatchMoveDescription - .4byte gSecretPowerMoveDescription - .4byte gDiveMoveDescription - .4byte gArmThrustMoveDescription - .4byte gCamouflageMoveDescription - .4byte gTailGlowMoveDescription - .4byte gLusterPurgeMoveDescription - .4byte gMistBallMoveDescription - .4byte gFeatherDanceMoveDescription - .4byte gTeeterDanceMoveDescription - .4byte gBlazeKickMoveDescription - .4byte gMudSportMoveDescription - .4byte gIceBallMoveDescription - .4byte gNeedleArmMoveDescription - .4byte gSlackOffMoveDescription - .4byte gHyperVoiceMoveDescription - .4byte gPoisonFangMoveDescription - .4byte gCrushClawMoveDescription - .4byte gBlastBurnMoveDescription - .4byte gHydroCannonMoveDescription - .4byte gMeteorMashMoveDescription - .4byte gAstonishMoveDescription - .4byte gWeatherBallMoveDescription - .4byte gAromatherapyMoveDescription - .4byte gFakeTearsMoveDescription - .4byte gAirCutterMoveDescription - .4byte gOverheatMoveDescription - .4byte gOdorSleuthMoveDescription - .4byte gRockTombMoveDescription - .4byte gSilverWindMoveDescription - .4byte gMetalSoundMoveDescription - .4byte gGrassWhistleMoveDescription - .4byte gTickleMoveDescription - .4byte gCosmicPowerMoveDescription - .4byte gWaterSpoutMoveDescription - .4byte gSignalBeamMoveDescription - .4byte gShadowPunchMoveDescription - .4byte gExtrasensoryMoveDescription - .4byte gSkyUppercutMoveDescription - .4byte gSandTombMoveDescription - .4byte gSheerColdMoveDescription - .4byte gMuddyWaterMoveDescription - .4byte gBulletSeedMoveDescription - .4byte gAerialAceMoveDescription - .4byte gIcicleSpearMoveDescription - .4byte gIronDefenseMoveDescription - .4byte gBlockMoveDescription - .4byte gHowlMoveDescription - .4byte gDragonClawMoveDescription - .4byte gFrenzyPlantMoveDescription - .4byte gBulkUpMoveDescription - .4byte gBounceMoveDescription - .4byte gMudShotMoveDescription - .4byte gPoisonTailMoveDescription - .4byte gCovetMoveDescription - .4byte gVoltTackleMoveDescription - .4byte gMagicalLeafMoveDescription - .4byte gWaterSportMoveDescription - .4byte gCalmMindMoveDescription - .4byte gLeafBladeMoveDescription - .4byte gDragonDanceMoveDescription - .4byte gRockBlastMoveDescription - .4byte gShockWaveMoveDescription - .4byte gWaterPulseMoveDescription - .4byte gDoomDesireMoveDescription - .4byte gPsychoBoostMoveDescription |