diff options
141 files changed, 1259 insertions, 1252 deletions
diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s index e882e7030..1f489ceb3 100644 --- a/asm/field_fadetransition.s +++ b/asm/field_fadetransition.s @@ -815,8 +815,8 @@ _08081022: _08081028: .4byte sub_8054588 thumb_func_end sub_8080FC4 - thumb_func_start sub_808102C -sub_808102C: @ 808102C + thumb_func_start DoCableClubWarp +DoCableClubWarp: @ 808102C push {lr} bl ScriptContext2_Enable bl sub_8053FF8 @@ -830,7 +830,7 @@ sub_808102C: @ 808102C bx r0 .align 2, 0 _0808104C: .4byte sub_8080FC4 - thumb_func_end sub_808102C + thumb_func_end DoCableClubWarp thumb_func_start sub_8081050 sub_8081050: @ 8081050 diff --git a/asm/macros/event.inc b/asm/macros/event.inc index e3caa0c4f..cd2927c66 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -241,14 +241,14 @@ @ Calls a special function; that is, a piece of ASM code designed for use by scripts and listed in a table of pointers. .macro special function .byte 0x25 - .2byte \function + .2byte SPECIAL_\function .endm @ Calls a special function. That function's output (if any) will be written to the variable you specify. .macro specialval output, function .byte 0x26 .2byte \output - .2byte \function + .2byte SPECIAL_\function .endm @ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock state, the script will remain blocked indefinitely (essentially a hang). diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index c06a4073a..4d809241c 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -433,16 +433,16 @@ EventScript_15F419: compare RESULT, 0 jumpeq EventScript_15F384 closebutton - special 10 + special SecretBasePC_PackUp releaseall end EventScript_15F432: - special 14 + special SecretBasePC_Decoration end EventScript_15F436: - special 15 + special SecretBasePC_Registry end gUnknown_0815F43A:: @ 815F43A @@ -475,18 +475,18 @@ gUnknown_0815F49A:: @ 815F49A end EventScript_15F4A1: - special 12 + special sub_80BC56C compare RESULT, 1 jumpeq EventScript_15F4E0 compare RESULT, 2 jumpeq EventScript_15F503 - special 303 + special sub_80BC224 msgbox UnknownString_81A3958, 5 compare RESULT, 0 jumpeq EventScript_15F452 msgbox UnknownString_81A3A22, 3 - special 13 - special 26 + special sub_80BC5BC + special sub_80C683C releaseall end @@ -495,14 +495,14 @@ EventScript_15F4E0: compare RESULT, 0 jumpeq EventScript_15F452 msgbox UnknownString_81A3A3A, 3 - special 13 - special 26 + special sub_80BC5BC + special sub_80C683C releaseall end EventScript_15F503: msgbox UnknownString_81A39C0, 3 - special 26 + special sub_80C683C closebutton releaseall end @@ -514,7 +514,7 @@ EventScript_15F511: end EventScript_15F51D: - special 26 + special sub_80C683C closebutton releaseall end @@ -525,7 +525,7 @@ gUnknown_0815F523:: @ 815F523 end gUnknown_0815F528:: @ 815F528 - special 307 + special GetShieldToyTVDecorationInfo compare RESULT, 0 jumpeq EventScript_15F558 compare RESULT, 1 @@ -925,14 +925,14 @@ LilycoveCity_ContestLobby_EventScript_19F806:: @ 819F806 MossdeepCity_GameCorner_1F_EventScript_19F806:: @ 819F806 OldaleTown_PokemonCenter_2F_EventScript_19F806:: @ 819F806 SecretBase_RedCave1_EventScript_19F806:: @ 819F806 - special 93 + special InitSaveDialog waitstate return gUnknown_0819F80B:: @ 819F80B lock - special 56 - special 55 + special PlayTrainerEncounterMusic + special sub_80847C8 waitstate jump EventScript_19F8F2 @@ -941,11 +941,11 @@ gUnknown_0819F818:: @ 819F818 faceplayer move LAST_TALKED, Movement_19F8F0 waitmove 0 - specialval RESULT, 54 + specialval RESULT, sub_8082564 compare RESULT, 0 jumpif 5, EventScript_19F83F - special 56 - special 314 + special PlayTrainerEncounterMusic + special sub_8082524 jump EventScript_19F8F2 EventScript_19F83F: @@ -955,18 +955,18 @@ gUnknown_0819F840:: @ 819F840 lock faceplayer call EventScript_19F8E5 - specialval RESULT, 54 + specialval RESULT, sub_8082564 compare RESULT, 0 jumpif 5, EventScript_19F877 - special 61 + special CheckForAlivePartyMons compare RESULT, 0 jumpif 5, EventScript_19F870 - special 56 - special 314 + special PlayTrainerEncounterMusic + special sub_8082524 jump EventScript_19F8F2 EventScript_19F870: - special 53 + special sub_8082718 waittext waitbutton release @@ -978,21 +978,21 @@ EventScript_19F877: gUnknown_0819F878:: @ 819F878 move LAST_TALKED, Movement_19F8F0 waitmove 0 - special 56 + special PlayTrainerEncounterMusic reptrainerbattle endtrainerbattle gUnknown_0819F887:: @ 819F887 call EventScript_19F8E5 - specialval RESULT, 58 + specialval RESULT, sub_8082C9C compare RESULT, 0 jumpeq EventScript_19F8AD - special 56 - special 314 - special 52 + special PlayTrainerEncounterMusic + special sub_8082524 + special sub_80826D8 waittext waitbutton - special 59 + special sub_80826B0 waitstate releaseall end @@ -1001,18 +1001,18 @@ EventScript_19F8AD: endtrainerbattle gUnknown_0819F8AE:: @ 819F8AE - specialval RESULT, 58 + specialval RESULT, sub_8082C9C compare RESULT, 0 jumpeq EventScript_19F8DD - special 61 + special CheckForAlivePartyMons compare RESULT, 0 jumpif 5, EventScript_19F8DE - special 56 - special 314 - special 52 + special PlayTrainerEncounterMusic + special sub_8082524 + special sub_80826D8 waittext waitbutton - special 59 + special sub_80826B0 waitstate releaseall end @@ -1021,7 +1021,7 @@ EventScript_19F8DD: endtrainerbattle EventScript_19F8DE: - special 53 + special sub_8082718 waittext waitbutton release @@ -1037,11 +1037,11 @@ Movement_19F8F0:: step_end EventScript_19F8F2: - special 52 + special sub_80826D8 waittext waitbutton reptrainerbattle - specialval RESULT, 51 + specialval RESULT, sub_8082558 compare RESULT, 0 jumpeq EventScript_19F934 compare RESULT, 2 @@ -1296,7 +1296,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 clearflag 751 clearflag 860 clearflag 861 - special 169 + special sub_810FAA0 checkflag 291 callif 0, EverGrandeCity_HallOfFame_EventScript_19FC62 checkflag 255 @@ -1455,7 +1455,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C checkanimation 25 move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845 waitmove 0 - special 0 + special HealPlayerParty checkflag 273 jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE jump OldaleTown_PokemonCenter_1F_EventScript_19FDB0 @@ -1476,7 +1476,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDC7:: @ 819FDC7 return OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE - specialval RESULT, 308 + specialval RESULT, IsPokerusInParty compare RESULT, 1 jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FDEA compare RESULT, 0 @@ -1645,7 +1645,7 @@ HiddenItemScript_Success: waitfanfare waittext msgbox Message_PutAwayItem - special 0x96 + special SetFlagInVar releaseall end @@ -1666,7 +1666,7 @@ UnusedMixRecordsScript: @ 819FFD5 jumpeq UnusedMixRecordsScript_Done jump UnusedMixRecordsScript_Done UnusedMixRecordsScript_Yes: @ 819FFFA - special 0x1B + special sub_80B929C waitstate lock faceplayer @@ -1680,7 +1680,7 @@ UnusedMixRecordsScript_Done: @ 81A0000 gUnknown_081A0009:: @ 81A0009 lockall setvar 0x8004, 0 - special 214 + special DoPCTurnOnEffect playsfx 4 msgbox UnknownString_81A09EC, 4 jump EventScript_1A0023 @@ -1689,7 +1689,7 @@ gUnknown_081A0009:: @ 81A0009 EventScript_1A0023: message gPCText_WhichPCShouldBeAccessed waittext - special 262 + special TryCreatePCMenu waitstate jump EventScript_1A0033 end @@ -1706,7 +1706,7 @@ EventScript_1A0033: EventScript_1A0070: playsfx 2 msgbox UnknownString_81A0A54, 4 - special 250 + special PlayerPC waitstate jump EventScript_1A0023 end @@ -1718,7 +1718,7 @@ EventScript_1A0085: checkflag 2123 callif 1, EventScript_1A00B5 msgbox UnknownString_81A0A35, 4 - special 60 + special ShowPokemonStorageSystem waitstate jump EventScript_1A0023 end @@ -1734,7 +1734,7 @@ EventScript_1A00B5: EventScript_1A00BE: setvar 0x8004, 0 playsfx 3 - special 215 + special DoPCTurnOffEffect releaseall end @@ -1742,7 +1742,7 @@ EventScript_1A00CB: checkflag 2052 jumpif 0, EventScript_1A00BE playsfx 2 - special 263 + special AccessHallOfFamePC waitstate jump EventScript_1A0033 end @@ -1789,7 +1789,7 @@ Route123_BerryMastersHouse_EventScript_1A00F3:: @ 81A00F3 SlateportCity_OceanicMuseum_1F_EventScript_1A00F3:: @ 81A00F3 SlateportCity_PokemonFanClub_EventScript_1A00F3:: @ 81A00F3 fadescreen 1 - special 95 + special sub_80E60D8 fadescreen 0 return @@ -1805,7 +1805,7 @@ DewfordTown_EventScript_1A0102:: @ 81A0102 DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 checkdailyflags setvar 0x8004, 0 - special 126 + special sub_80FA5BC return DewfordTown_EventScript_1A010C:: @ 81A010C @@ -2112,7 +2112,7 @@ SSTidalRooms_EventScript_1A02CA:: @ 81A02CA fadescreen 1 fanfare 368 waitfanfare - special 0 + special HealPlayerParty fadescreen 0 return @@ -2120,7 +2120,7 @@ Event_WorldMap:: @ 81A02D6 lockall msgbox UnknownString_817303D, 4 fadescreen 1 - special 251 + special FieldShowRegionMap waitstate releaseall end @@ -2202,7 +2202,7 @@ Route101_EventScript_1A039B:: @ 81A039B Route101_EventScript_1A03A5:: @ 81A03A5 copyvar 0x8004, 0x8009 - special 213 + special ShowPokedexRatingMessage waittext waitbutton return @@ -2210,7 +2210,7 @@ Route101_EventScript_1A03A5:: @ 81A03A5 EverGrandeCity_ChampionsRoom_EventScript_1A03B0:: @ 81A03B0 Route101_EventScript_1A03B0:: @ 81A03B0 setvar 0x8004, 0 - specialval RESULT, 212 + specialval RESULT, ScriptGetPokedexInfo copyvar 0x8008, 0x8005 copyvar 0x8009, 0x8006 copyvar 0x800a, RESULT @@ -2221,7 +2221,7 @@ Route101_EventScript_1A03B0:: @ 81A03B0 compare 0x800a, 0 jumpeq Route101_EventScript_1A14DC setvar 0x8004, 1 - specialval RESULT, 212 + specialval RESULT, ScriptGetPokedexInfo copyvar 0x8008, 0x8005 copyvar 0x8009, 0x8006 buffernum 0, 0x8008 @@ -2329,7 +2329,7 @@ CaveOfOrigin_1F_EventScript_1A04D3:: @ 81A04D3 CaveOfOrigin_B2F_EventScript_1A04D3:: @ 81A04D3 setvar 0x8004, 1 setvar 0x8005, 1 - special 310 + special sub_810F758 waitstate releaseall end @@ -2534,7 +2534,7 @@ MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678 RustboroCity_DevonCorp_2F_EventScript_1A0678:: @ 81A0678 SlateportCity_House1_EventScript_1A0678:: @ 81A0678 fadescreen 1 - special 158 + special sub_80BF9F8 waitstate return @@ -2569,7 +2569,7 @@ EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693 setmaptile 10, 2, 733, 1 setmaptile 11, 2, 734, 1 setmaptile 12, 2, 733, 1 - special 142 + special DrawWholeMapView return EverGrandeCity_DrakesRoom_EventScript_1A0710:: @ 81A0710 @@ -2585,7 +2585,7 @@ EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710 setmaptile 5, 13, 526, 1 setmaptile 6, 13, 526, 1 setmaptile 7, 13, 526, 1 - special 142 + special DrawWholeMapView return EverGrandeCity_DrakesRoom_EventScript_1A0757:: @ 81A0757 @@ -3261,7 +3261,7 @@ Event_NoRegisteredItem:: @ 81A14AF gUnknown_081A14B8:: @ 81A14B8 lockall - special 199 + special ExecuteWhiteOut waitstate compare RESULT, 1 jumpeq EventScript_1A14CA @@ -3272,10 +3272,10 @@ EventScript_1A14CA:: message UnknownString_81A1141 waittext waitbutton - special 332 + special sub_8081924 waitstate fadescreen 1 - special 200 + special sp0C8_whiteout_maybe waitstate end @@ -3616,8 +3616,8 @@ SecretBase_RedCave1_Text_1A2BA4:: @ 81A2BA4 .string "Bist du sprachlos? Hihihi...$" gUnknown_081A2C51:: @ 81A2C51 - special 21 - special 7 + special sub_80BB70C + special sub_80BB63C compare RESULT, 1 jumpeq EventScript_1A2E45 checkattack MOVE_SECRET_POWER @@ -3735,11 +3735,11 @@ EventScript_1A2DB8: playsfx 9 setvar 0x4097, 0 setflag 173 - special 6 - special 8 + special sub_80BB8CC + special sub_80BBAF0 setvar 0x8004, 0 setvar 0x8005, 0 - special 18 + special sub_80BBDD0 setvar 0x4089, 1 waitstate end @@ -3753,13 +3753,13 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE jumpeq SecretBase_RedCave1_EventScript_1A2E08 closebutton playsfx 9 - special 9 + special sub_80BC440 end SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08 closebutton setflag 96 - special 24 + special sub_80BBC78 waitstate end @@ -3772,18 +3772,18 @@ gUnknown_081A2E14:: @ 81A2E14 lockall setvar 0x4097, 1 playsfx 9 - special 11 + special sub_80BC114 compare RESULT, 0 jumpeq EventScript_1A2E38 clearflag 173 - special 8 + special sub_80BBAF0 setvar 0x4089, 0 waitstate end EventScript_1A2E38: setflag 173 - special 8 + special sub_80BBAF0 setvar 0x4089, 0 waitstate end @@ -3795,7 +3795,7 @@ EventScript_1A2E45: setanimation 0, RESULT setorcopyvar 0x8004, RESULT lockall - special 278 + special GetSecretBaseNearbyMapName msgbox UnknownString_81A3C71, 5 compare RESULT, 0 jumpeq EventScript_1A2F3A @@ -3803,7 +3803,7 @@ EventScript_1A2E45: compare RESULT, 0 jumpeq EventScript_1A2F3A fadescreen 1 - special 330 + special sub_80BC50C closebutton fadescreen 0 msgbox UnknownString_81A3CC9, 5 @@ -3873,7 +3873,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1A2F68:: @ 81A2F68 SecretBase_RedCave1_EventScript_1A2F68:: @ 81A2F68 setvar 0x8004, 0 setvar 0x8005, 0 - special 18 + special sub_80BBDD0 setvar 0x4089, 1 end @@ -3883,7 +3883,7 @@ gUnknown_081A2F7B:: @ 81A2F7B end EventScript_1A2F86: - special 19 + special sub_80FF474 end gUnknown_081A2F8A:: @ 81A2F8A @@ -3892,7 +3892,7 @@ gUnknown_081A2F8A:: @ 81A2F8A end EventScript_1A2F95: - special 23 + special sub_8100A7C compare RESULT, 1 jumpeq EventScript_1A2FBF addvar 0x8004, 1 @@ -3930,7 +3930,7 @@ SecretBase_YellowCave1_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave2_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave3_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0 - special 17 + special sub_80BCE90 compare 0x8004, 0 jumpeq SecretBase_RedCave1_EventScript_1A3032 compare 0x8004, 1 @@ -3964,7 +3964,7 @@ SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A308F setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A308F @@ -3979,7 +3979,7 @@ SecretBase_RedCave1_EventScript_1A3086:: @ 81A3086 SecretBase_RedCave1_EventScript_1A308F:: @ 81A308F setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1B97, 2 end @@ -3999,7 +3999,7 @@ SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A310B setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A310B @@ -4014,7 +4014,7 @@ SecretBase_RedCave1_EventScript_1A3102:: @ 81A3102 SecretBase_RedCave1_EventScript_1A310B:: @ 81A310B setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1F2E, 2 end @@ -4034,7 +4034,7 @@ SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A3187 setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A3187 @@ -4049,7 +4049,7 @@ SecretBase_RedCave1_EventScript_1A317E:: @ 81A317E SecretBase_RedCave1_EventScript_1A3187:: @ 81A3187 setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2230, 2 end @@ -4069,7 +4069,7 @@ SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A3203 setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A3203 @@ -4084,7 +4084,7 @@ SecretBase_RedCave1_EventScript_1A31FA:: @ 81A31FA SecretBase_RedCave1_EventScript_1A3203:: @ 81A3203 setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A258A, 2 end @@ -4104,7 +4104,7 @@ SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A327F setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A327F @@ -4119,7 +4119,7 @@ SecretBase_RedCave1_EventScript_1A3276:: @ 81A3276 SecretBase_RedCave1_EventScript_1A327F:: @ 81A327F setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A28F4, 2 end @@ -4139,7 +4139,7 @@ SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A32FB setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A32FB @@ -4154,7 +4154,7 @@ SecretBase_RedCave1_EventScript_1A32F2:: @ 81A32F2 SecretBase_RedCave1_EventScript_1A32FB:: @ 81A32FB setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1D59, 2 end @@ -4174,7 +4174,7 @@ SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A3377 setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A3377 @@ -4189,7 +4189,7 @@ SecretBase_RedCave1_EventScript_1A336E:: @ 81A336E SecretBase_RedCave1_EventScript_1A3377:: @ 81A3377 setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A20AE, 2 end @@ -4209,7 +4209,7 @@ SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A33F3 setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A33F3 @@ -4224,7 +4224,7 @@ SecretBase_RedCave1_EventScript_1A33EA:: @ 81A33EA SecretBase_RedCave1_EventScript_1A33F3:: @ 81A33F3 setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2420, 2 end @@ -4244,7 +4244,7 @@ SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A346F setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A346F @@ -4259,7 +4259,7 @@ SecretBase_RedCave1_EventScript_1A3466:: @ 81A3466 SecretBase_RedCave1_EventScript_1A346F:: @ 81A346F setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2736, 2 end @@ -4279,7 +4279,7 @@ SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A34EB setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A34EB @@ -4294,7 +4294,7 @@ SecretBase_RedCave1_EventScript_1A34E2:: @ 81A34E2 SecretBase_RedCave1_EventScript_1A34EB:: @ 81A34EB setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2AFB, 2 end @@ -4304,12 +4304,12 @@ SecretBase_RedCave1_EventScript_1A3501:: @ 81A3501 end SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A - special 16 + special sub_80BCE1C setvar 0x8004, 1 setvar 0x8005, 0 - special 236 + special sub_813556C waitstate - special 0 + special HealPlayerParty release end @@ -4405,14 +4405,14 @@ BattleTower_Lobby_EventScript_1ADE46:: @ 81ADE46 FallarborTown_ContestLobby_EventScript_1ADE46:: @ 81ADE46 SlateportCity_OceanicMuseum_1F_EventScript_1ADE46:: @ 81ADE46 SlateportCity_PokemonFanClub_EventScript_1ADE46:: @ 81ADE46 - special 68 + special sub_80BDE48 inccounter GAME_STAT_GOT_INTERVIEWED release end SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D setvar 0x8005, 1 - special 67 + special sub_80BF2C4 compare RESULT, 1 jumpeq SlateportCity_PokemonFanClub_EventScript_1ADED6 copyvar 0x8009, 0x8006 @@ -4457,7 +4457,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 lock faceplayer setvar 0x8005, 2 - special 67 + special sub_80BF2C4 compare RESULT, 1 jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 copyvar 0x8009, 0x8006 @@ -4512,11 +4512,11 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF96:: @ 81ADF96 SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 lock faceplayer - specialval RESULT, 69 + specialval RESULT, sub_80BF544 compare RESULT, 0 jumpeq SlateportCity_PokemonFanClub_EventScript_1ADE4D setvar 0x8005, 3 - special 67 + special sub_80BF2C4 compare RESULT, 1 jumpeq SlateportCity_PokemonFanClub_EventScript_1AE0AC copyvar 0x8009, 0x8006 @@ -4593,7 +4593,7 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 checkflag 2 jumpeq FallarborTown_ContestLobby_EventScript_1AE17E setvar 0x8005, 6 - special 67 + special sub_80BF2C4 compare RESULT, 1 jumpeq FallarborTown_ContestLobby_EventScript_1AE17E copyvar 0x8009, 0x8006 @@ -4625,7 +4625,7 @@ FallarborTown_ContestLobby_EventScript_1AE12D:: @ 81AE12D FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 setvar 0x8004, 24 - special 70 + special SetContestCategoryStringVarForInterview msgbox FallarborTown_ContestLobby_Text_1A70A5, 4 setvar 0x8004, 11 copyvar 0x8005, 0x8009 @@ -4653,7 +4653,7 @@ VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 compare 0x4086, 2 jumpif 5, FallarborTown_ContestLobby_EventScript_1AE1FE setvar 0x8005, 6 - special 67 + special sub_80BF2C4 compare RESULT, 1 jumpeq FallarborTown_ContestLobby_EventScript_1AE1FE switch 0x4088 @@ -4690,7 +4690,7 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF checkflag 2 jumpeq BattleTower_Lobby_EventScript_1AE2E3 setvar 0x8005, 7 - special 67 + special sub_80BF2C4 compare RESULT, 1 jumpeq BattleTower_Lobby_EventScript_1AE2E3 copyvar 0x8009, 0x8006 @@ -4759,7 +4759,7 @@ BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED compare 0x40bc, 0 jumpeq BattleTower_Lobby_EventScript_1AE30F setvar 0x8005, 7 - special 67 + special sub_80BF2C4 compare RESULT, 1 jumpeq BattleTower_Lobby_EventScript_1AE30F clearflag 918 @@ -4854,7 +4854,7 @@ MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC end MauvilleCity_GameCorner_EventScript_1C40DA:: @ 81C40DA - special 162 + special PlayRoulette waitstate end @@ -4927,7 +4927,7 @@ gUnknown_081C6BDE:: @ 81C6BDE waitmove 0 playsfx 43 pause 60 - special 319 + special sp13F_fall_to_last_warp waitstate end diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc index d0ed559ec..91c3dcca8 100644 --- a/data-de/field_move_scripts.inc +++ b/data-de/field_move_scripts.inc @@ -90,10 +90,10 @@ DoRockSmashMovement: @ 81B0F0C move LAST_TALKED, RockSmashMovement waitmove 0 disappear LAST_TALKED - specialval RESULT, 298 + specialval RESULT, sub_810F5BC compare RESULT, 1 jumpeq DoRockSmashMovement_Done - special 171 + special RockSmashWildEncounter compare RESULT, 0 jumpeq DoRockSmashMovement_Done waitstate diff --git a/data/event_scripts.s b/data/event_scripts.s index d909f1006..d6702745a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -433,16 +433,16 @@ EventScript_15F419: compare RESULT, 0 jumpeq EventScript_15F384 closebutton - special 10 + special SecretBasePC_PackUp releaseall end EventScript_15F432: - special 14 + special SecretBasePC_Decoration end EventScript_15F436: - special 15 + special SecretBasePC_Registry end gUnknown_0815F43A:: @ 815F43A @@ -475,18 +475,18 @@ gUnknown_0815F49A:: @ 815F49A end EventScript_15F4A1: - special 12 + special sub_80BC56C compare RESULT, 1 jumpeq EventScript_15F4E0 compare RESULT, 2 jumpeq EventScript_15F503 - special 303 + special sub_80BC224 msgbox UnknownString_81A3958, 5 compare RESULT, 0 jumpeq EventScript_15F452 msgbox UnknownString_81A3A22, 3 - special 13 - special 26 + special sub_80BC5BC + special sub_80C683C releaseall end @@ -495,14 +495,14 @@ EventScript_15F4E0: compare RESULT, 0 jumpeq EventScript_15F452 msgbox UnknownString_81A3A3A, 3 - special 13 - special 26 + special sub_80BC5BC + special sub_80C683C releaseall end EventScript_15F503: msgbox UnknownString_81A39C0, 3 - special 26 + special sub_80C683C closebutton releaseall end @@ -514,7 +514,7 @@ EventScript_15F511: end EventScript_15F51D: - special 26 + special sub_80C683C closebutton releaseall end @@ -525,7 +525,7 @@ gUnknown_0815F523:: @ 815F523 end gUnknown_0815F528:: @ 815F528 - special 307 + special GetShieldToyTVDecorationInfo compare RESULT, 0 jumpeq EventScript_15F558 compare RESULT, 1 @@ -924,14 +924,14 @@ LilycoveCity_ContestLobby_EventScript_19F806:: @ 819F806 MossdeepCity_GameCorner_1F_EventScript_19F806:: @ 819F806 OldaleTown_PokemonCenter_2F_EventScript_19F806:: @ 819F806 SecretBase_RedCave1_EventScript_19F806:: @ 819F806 - special 93 + special InitSaveDialog waitstate return gUnknown_0819F80B:: @ 819F80B lock - special 56 - special 55 + special PlayTrainerEncounterMusic + special sub_80847C8 waitstate jump EventScript_19F8F2 @@ -940,11 +940,11 @@ gUnknown_0819F818:: @ 819F818 faceplayer move LAST_TALKED, Movement_19F8F0 waitmove 0 - specialval RESULT, 54 + specialval RESULT, sub_8082564 compare RESULT, 0 jumpif 5, EventScript_19F83F - special 56 - special 314 + special PlayTrainerEncounterMusic + special sub_8082524 jump EventScript_19F8F2 EventScript_19F83F: @@ -954,18 +954,18 @@ gUnknown_0819F840:: @ 819F840 lock faceplayer call EventScript_19F8E5 - specialval RESULT, 54 + specialval RESULT, sub_8082564 compare RESULT, 0 jumpif 5, EventScript_19F877 - special 61 + special CheckForAlivePartyMons compare RESULT, 0 jumpif 5, EventScript_19F870 - special 56 - special 314 + special PlayTrainerEncounterMusic + special sub_8082524 jump EventScript_19F8F2 EventScript_19F870: - special 53 + special sub_8082718 waittext waitbutton release @@ -977,21 +977,21 @@ EventScript_19F877: gUnknown_0819F878:: @ 819F878 move LAST_TALKED, Movement_19F8F0 waitmove 0 - special 56 + special PlayTrainerEncounterMusic reptrainerbattle endtrainerbattle gUnknown_0819F887:: @ 819F887 call EventScript_19F8E5 - specialval RESULT, 58 + specialval RESULT, sub_8082C9C compare RESULT, 0 jumpeq EventScript_19F8AD - special 56 - special 314 - special 52 + special PlayTrainerEncounterMusic + special sub_8082524 + special sub_80826D8 waittext waitbutton - special 59 + special sub_80826B0 waitstate releaseall end @@ -1000,18 +1000,18 @@ EventScript_19F8AD: endtrainerbattle gUnknown_0819F8AE:: @ 819F8AE - specialval RESULT, 58 + specialval RESULT, sub_8082C9C compare RESULT, 0 jumpeq EventScript_19F8DD - special 61 + special CheckForAlivePartyMons compare RESULT, 0 jumpif 5, EventScript_19F8DE - special 56 - special 314 - special 52 + special PlayTrainerEncounterMusic + special sub_8082524 + special sub_80826D8 waittext waitbutton - special 59 + special sub_80826B0 waitstate releaseall end @@ -1020,7 +1020,7 @@ EventScript_19F8DD: endtrainerbattle EventScript_19F8DE: - special 53 + special sub_8082718 waittext waitbutton release @@ -1036,11 +1036,11 @@ Movement_19F8F0:: step_end EventScript_19F8F2: - special 52 + special sub_80826D8 waittext waitbutton reptrainerbattle - specialval RESULT, 51 + specialval RESULT, sub_8082558 compare RESULT, 0 jumpeq EventScript_19F934 compare RESULT, 2 @@ -1295,7 +1295,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 clearflag 751 clearflag 860 clearflag 861 - special 169 + special sub_810FAA0 checkflag 291 callif 0, EverGrandeCity_HallOfFame_EventScript_19FC62 checkflag 255 @@ -1454,7 +1454,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C checkanimation 25 move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845 waitmove 0 - special 0 + special HealPlayerParty checkflag 273 jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE jump OldaleTown_PokemonCenter_1F_EventScript_19FDB0 @@ -1475,7 +1475,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDC7:: @ 819FDC7 return OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE - specialval RESULT, 308 + specialval RESULT, IsPokerusInParty compare RESULT, 1 jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FDEA compare RESULT, 0 @@ -1644,7 +1644,7 @@ HiddenItemScript_Success: waitfanfare waittext msgbox Message_PutAwayItem - special 0x96 + special SetFlagInVar releaseall end @@ -1665,7 +1665,7 @@ UnusedMixRecordsScript: @ 819FFD5 jumpeq UnusedMixRecordsScript_Done jump UnusedMixRecordsScript_Done UnusedMixRecordsScript_Yes: @ 819FFFA - special 0x1B + special sub_80B929C waitstate lock faceplayer @@ -1679,7 +1679,7 @@ UnusedMixRecordsScript_Done: @ 81A0000 gUnknown_081A0009:: @ 81A0009 lockall setvar 0x8004, 0 - special 214 + special DoPCTurnOnEffect playsfx 4 msgbox UnknownString_81A09EC, 4 jump EventScript_1A0023 @@ -1688,7 +1688,7 @@ gUnknown_081A0009:: @ 81A0009 EventScript_1A0023: message gPCText_WhichPCShouldBeAccessed waittext - special 262 + special TryCreatePCMenu waitstate jump EventScript_1A0033 end @@ -1705,7 +1705,7 @@ EventScript_1A0033: EventScript_1A0070: playsfx 2 msgbox UnknownString_81A0A54, 4 - special 250 + special PlayerPC waitstate jump EventScript_1A0023 end @@ -1717,7 +1717,7 @@ EventScript_1A0085: checkflag 2123 callif 1, EventScript_1A00B5 msgbox UnknownString_81A0A35, 4 - special 60 + special ShowPokemonStorageSystem waitstate jump EventScript_1A0023 end @@ -1733,7 +1733,7 @@ EventScript_1A00B5: EventScript_1A00BE: setvar 0x8004, 0 playsfx 3 - special 215 + special DoPCTurnOffEffect releaseall end @@ -1741,7 +1741,7 @@ EventScript_1A00CB: checkflag 2052 jumpif 0, EventScript_1A00BE playsfx 2 - special 263 + special AccessHallOfFamePC waitstate jump EventScript_1A0033 end @@ -1788,7 +1788,7 @@ Route123_BerryMastersHouse_EventScript_1A00F3:: @ 81A00F3 SlateportCity_OceanicMuseum_1F_EventScript_1A00F3:: @ 81A00F3 SlateportCity_PokemonFanClub_EventScript_1A00F3:: @ 81A00F3 fadescreen 1 - special 95 + special sub_80E60D8 fadescreen 0 return @@ -1804,7 +1804,7 @@ DewfordTown_EventScript_1A0102:: @ 81A0102 DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 checkdailyflags setvar 0x8004, 0 - special 126 + special sub_80FA5BC return DewfordTown_EventScript_1A010C:: @ 81A010C @@ -2111,7 +2111,7 @@ SSTidalRooms_EventScript_1A02CA:: @ 81A02CA fadescreen 1 fanfare 368 waitfanfare - special 0 + special HealPlayerParty fadescreen 0 return @@ -2119,7 +2119,7 @@ Event_WorldMap:: @ 81A02D6 lockall msgbox UnknownString_817303D, 4 fadescreen 1 - special 251 + special FieldShowRegionMap waitstate releaseall end @@ -2201,7 +2201,7 @@ Route101_EventScript_1A039B:: @ 81A039B Route101_EventScript_1A03A5:: @ 81A03A5 copyvar 0x8004, 0x8009 - special 213 + special ShowPokedexRatingMessage waittext waitbutton return @@ -2209,7 +2209,7 @@ Route101_EventScript_1A03A5:: @ 81A03A5 EverGrandeCity_ChampionsRoom_EventScript_1A03B0:: @ 81A03B0 Route101_EventScript_1A03B0:: @ 81A03B0 setvar 0x8004, 0 - specialval RESULT, 212 + specialval RESULT, ScriptGetPokedexInfo copyvar 0x8008, 0x8005 copyvar 0x8009, 0x8006 copyvar 0x800a, RESULT @@ -2220,7 +2220,7 @@ Route101_EventScript_1A03B0:: @ 81A03B0 compare 0x800a, 0 jumpeq Route101_EventScript_1A14DC setvar 0x8004, 1 - specialval RESULT, 212 + specialval RESULT, ScriptGetPokedexInfo copyvar 0x8008, 0x8005 copyvar 0x8009, 0x8006 buffernum 0, 0x8008 @@ -2328,7 +2328,7 @@ CaveOfOrigin_1F_EventScript_1A04D3:: @ 81A04D3 CaveOfOrigin_B2F_EventScript_1A04D3:: @ 81A04D3 setvar 0x8004, 1 setvar 0x8005, 1 - special 310 + special sub_810F758 waitstate releaseall end @@ -2533,7 +2533,7 @@ MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678 RustboroCity_DevonCorp_2F_EventScript_1A0678:: @ 81A0678 SlateportCity_House1_EventScript_1A0678:: @ 81A0678 fadescreen 1 - special 158 + special sub_80BF9F8 waitstate return @@ -2568,7 +2568,7 @@ EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693 setmaptile 10, 2, 733, 1 setmaptile 11, 2, 734, 1 setmaptile 12, 2, 733, 1 - special 142 + special DrawWholeMapView return EverGrandeCity_DrakesRoom_EventScript_1A0710:: @ 81A0710 @@ -2584,7 +2584,7 @@ EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710 setmaptile 5, 13, 526, 1 setmaptile 6, 13, 526, 1 setmaptile 7, 13, 526, 1 - special 142 + special DrawWholeMapView return EverGrandeCity_DrakesRoom_EventScript_1A0757:: @ 81A0757 @@ -3256,7 +3256,7 @@ Event_NoRegisteredItem:: @ 81A14AF gUnknown_081A14B8:: @ 81A14B8 lockall - special 199 + special ExecuteWhiteOut waitstate compare RESULT, 1 jumpeq EventScript_1A14CA @@ -3267,10 +3267,10 @@ EventScript_1A14CA:: message UnknownString_81A1141 waittext waitbutton - special 332 + special sub_8081924 waitstate fadescreen 1 - special 200 + special sp0C8_whiteout_maybe waitstate end @@ -3600,8 +3600,8 @@ SecretBase_RedCave1_Text_1A2BA4:: @ 81A2BA4 .string "Are you speechless?$" gUnknown_081A2C51:: @ 81A2C51 - special 21 - special 7 + special sub_80BB70C + special sub_80BB63C compare RESULT, 1 jumpeq EventScript_1A2E45 checkattack MOVE_SECRET_POWER @@ -3719,11 +3719,11 @@ EventScript_1A2DB8: playsfx 9 setvar 0x4097, 0 setflag 173 - special 6 - special 8 + special sub_80BB8CC + special sub_80BBAF0 setvar 0x8004, 0 setvar 0x8005, 0 - special 18 + special sub_80BBDD0 setvar 0x4089, 1 waitstate end @@ -3737,13 +3737,13 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE jumpeq SecretBase_RedCave1_EventScript_1A2E08 closebutton playsfx 9 - special 9 + special sub_80BC440 end SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08 closebutton setflag 96 - special 24 + special sub_80BBC78 waitstate end @@ -3756,18 +3756,18 @@ gUnknown_081A2E14:: @ 81A2E14 lockall setvar 0x4097, 1 playsfx 9 - special 11 + special sub_80BC114 compare RESULT, 0 jumpeq EventScript_1A2E38 clearflag 173 - special 8 + special sub_80BBAF0 setvar 0x4089, 0 waitstate end EventScript_1A2E38: setflag 173 - special 8 + special sub_80BBAF0 setvar 0x4089, 0 waitstate end @@ -3779,7 +3779,7 @@ EventScript_1A2E45: setanimation 0, RESULT setorcopyvar 0x8004, RESULT lockall - special 278 + special GetSecretBaseNearbyMapName msgbox UnknownString_81A3C71, 5 compare RESULT, 0 jumpeq EventScript_1A2F3A @@ -3787,7 +3787,7 @@ EventScript_1A2E45: compare RESULT, 0 jumpeq EventScript_1A2F3A fadescreen 1 - special 330 + special sub_80BC50C closebutton fadescreen 0 msgbox UnknownString_81A3CC9, 5 @@ -3857,7 +3857,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1A2F68:: @ 81A2F68 SecretBase_RedCave1_EventScript_1A2F68:: @ 81A2F68 setvar 0x8004, 0 setvar 0x8005, 0 - special 18 + special sub_80BBDD0 setvar 0x4089, 1 end @@ -3867,7 +3867,7 @@ gUnknown_081A2F7B:: @ 81A2F7B end EventScript_1A2F86: - special 19 + special sub_80FF474 end gUnknown_081A2F8A:: @ 81A2F8A @@ -3876,7 +3876,7 @@ gUnknown_081A2F8A:: @ 81A2F8A end EventScript_1A2F95: - special 23 + special sub_8100A7C compare RESULT, 1 jumpeq EventScript_1A2FBF addvar 0x8004, 1 @@ -3914,7 +3914,7 @@ SecretBase_YellowCave1_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave2_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave3_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0 - special 17 + special sub_80BCE90 compare 0x8004, 0 jumpeq SecretBase_RedCave1_EventScript_1A3032 compare 0x8004, 1 @@ -3948,7 +3948,7 @@ SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A308F setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A308F @@ -3963,7 +3963,7 @@ SecretBase_RedCave1_EventScript_1A3086:: @ 81A3086 SecretBase_RedCave1_EventScript_1A308F:: @ 81A308F setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1B97, 2 end @@ -3983,7 +3983,7 @@ SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A310B setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A310B @@ -3998,7 +3998,7 @@ SecretBase_RedCave1_EventScript_1A3102:: @ 81A3102 SecretBase_RedCave1_EventScript_1A310B:: @ 81A310B setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1F2E, 2 end @@ -4018,7 +4018,7 @@ SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A3187 setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A3187 @@ -4033,7 +4033,7 @@ SecretBase_RedCave1_EventScript_1A317E:: @ 81A317E SecretBase_RedCave1_EventScript_1A3187:: @ 81A3187 setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2230, 2 end @@ -4053,7 +4053,7 @@ SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A3203 setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A3203 @@ -4068,7 +4068,7 @@ SecretBase_RedCave1_EventScript_1A31FA:: @ 81A31FA SecretBase_RedCave1_EventScript_1A3203:: @ 81A3203 setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A258A, 2 end @@ -4088,7 +4088,7 @@ SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A327F setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A327F @@ -4103,7 +4103,7 @@ SecretBase_RedCave1_EventScript_1A3276:: @ 81A3276 SecretBase_RedCave1_EventScript_1A327F:: @ 81A327F setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A28F4, 2 end @@ -4123,7 +4123,7 @@ SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A32FB setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A32FB @@ -4138,7 +4138,7 @@ SecretBase_RedCave1_EventScript_1A32F2:: @ 81A32F2 SecretBase_RedCave1_EventScript_1A32FB:: @ 81A32FB setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1D59, 2 end @@ -4158,7 +4158,7 @@ SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A3377 setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A3377 @@ -4173,7 +4173,7 @@ SecretBase_RedCave1_EventScript_1A336E:: @ 81A336E SecretBase_RedCave1_EventScript_1A3377:: @ 81A3377 setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A20AE, 2 end @@ -4193,7 +4193,7 @@ SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A33F3 setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A33F3 @@ -4208,7 +4208,7 @@ SecretBase_RedCave1_EventScript_1A33EA:: @ 81A33EA SecretBase_RedCave1_EventScript_1A33F3:: @ 81A33F3 setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2420, 2 end @@ -4228,7 +4228,7 @@ SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A346F setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A346F @@ -4243,7 +4243,7 @@ SecretBase_RedCave1_EventScript_1A3466:: @ 81A3466 SecretBase_RedCave1_EventScript_1A346F:: @ 81A346F setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2736, 2 end @@ -4263,7 +4263,7 @@ SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A34EB setvar RESULT, 1 - special 25 + special sub_80BCE4C call SecretBase_RedCave1_EventScript_19F806 compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A34EB @@ -4278,7 +4278,7 @@ SecretBase_RedCave1_EventScript_1A34E2:: @ 81A34E2 SecretBase_RedCave1_EventScript_1A34EB:: @ 81A34EB setvar RESULT, 0 - special 25 + special sub_80BCE4C hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2AFB, 2 end @@ -4288,12 +4288,12 @@ SecretBase_RedCave1_EventScript_1A3501:: @ 81A3501 end SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A - special 16 + special sub_80BCE1C setvar 0x8004, 1 setvar 0x8005, 0 - special 236 + special sub_813556C waitstate - special 0 + special HealPlayerParty release end @@ -4378,14 +4378,14 @@ BattleTower_Lobby_EventScript_1ADE46:: @ 81ADE46 FallarborTown_ContestLobby_EventScript_1ADE46:: @ 81ADE46 SlateportCity_OceanicMuseum_1F_EventScript_1ADE46:: @ 81ADE46 SlateportCity_PokemonFanClub_EventScript_1ADE46:: @ 81ADE46 - special 68 + special sub_80BDE48 inccounter GAME_STAT_GOT_INTERVIEWED release end SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D setvar 0x8005, 1 - special 67 + special sub_80BF2C4 compare RESULT, 1 jumpeq SlateportCity_PokemonFanClub_EventScript_1ADED6 copyvar 0x8009, 0x8006 @@ -4430,7 +4430,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 lock faceplayer setvar 0x8005, 2 - special 67 + special sub_80BF2C4 compare RESULT, 1 jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 copyvar 0x8009, 0x8006 @@ -4485,11 +4485,11 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF96:: @ 81ADF96 SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 lock faceplayer - specialval RESULT, 69 + specialval RESULT, sub_80BF544 compare RESULT, 0 jumpeq SlateportCity_PokemonFanClub_EventScript_1ADE4D setvar 0x8005, 3 - special 67 + special sub_80BF2C4 compare RESULT, 1 jumpeq SlateportCity_PokemonFanClub_EventScript_1AE0AC copyvar 0x8009, 0x8006 @@ -4566,7 +4566,7 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 checkflag 2 jumpeq FallarborTown_ContestLobby_EventScript_1AE17E setvar 0x8005, 6 - special 67 + special sub_80BF2C4 compare RESULT, 1 jumpeq FallarborTown_ContestLobby_EventScript_1AE17E copyvar 0x8009, 0x8006 @@ -4598,7 +4598,7 @@ FallarborTown_ContestLobby_EventScript_1AE12D:: @ 81AE12D FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 setvar 0x8004, 24 - special 70 + special SetContestCategoryStringVarForInterview msgbox FallarborTown_ContestLobby_Text_1A70A5, 4 setvar 0x8004, 11 copyvar 0x8005, 0x8009 @@ -4626,7 +4626,7 @@ VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 compare 0x4086, 2 jumpif 5, FallarborTown_ContestLobby_EventScript_1AE1FE setvar 0x8005, 6 - special 67 + special sub_80BF2C4 compare RESULT, 1 jumpeq FallarborTown_ContestLobby_EventScript_1AE1FE switch 0x4088 @@ -4663,7 +4663,7 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF checkflag 2 jumpeq BattleTower_Lobby_EventScript_1AE2E3 setvar 0x8005, 7 - special 67 + special sub_80BF2C4 compare RESULT, 1 jumpeq BattleTower_Lobby_EventScript_1AE2E3 copyvar 0x8009, 0x8006 @@ -4732,7 +4732,7 @@ BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED compare 0x40bc, 0 jumpeq BattleTower_Lobby_EventScript_1AE30F setvar 0x8005, 7 - special 67 + special sub_80BF2C4 compare RESULT, 1 jumpeq BattleTower_Lobby_EventScript_1AE30F clearflag 918 @@ -4827,7 +4827,7 @@ MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC end MauvilleCity_GameCorner_EventScript_1C40DA:: @ 81C40DA - special 162 + special PlayRoulette waitstate end @@ -4900,7 +4900,7 @@ gUnknown_081C6BDE:: @ 81C6BDE waitmove 0 playsfx 43 pause 60 - special 319 + special sp13F_fall_to_last_warp waitstate end diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 413ab351a..315217055 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -87,10 +87,10 @@ DoRockSmashMovement: @ 81B0F0C move LAST_TALKED, RockSmashMovement waitmove 0 disappear LAST_TALKED - specialval RESULT, 298 + specialval RESULT, sub_810F5BC compare RESULT, 1 jumpeq DoRockSmashMovement_Done - special 171 + special RockSmashWildEncounter compare RESULT, 0 jumpeq DoRockSmashMovement_Done waitstate diff --git a/data/scripts/bard.inc b/data/scripts/bard.inc index a30045fc8..3f25b100f 100644 --- a/data/scripts/bard.inc +++ b/data/scripts/bard.inc @@ -1,5 +1,5 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744 - special 97 + special sub_80F7B14 switch RESULT case 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE784 case 1, MauvilleCity_PokemonCenter_1F_EventScript_1AE845 @@ -20,9 +20,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AE784:: @ 81AE784 MauvilleCity_PokemonCenter_1F_EventScript_1AE7A5:: @ 81AE7A5 setvar 0x8004, 0 - special 103 + special sub_80F7C54 pause 60 - special 98 + special sub_80F7B2C compare RESULT, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7D2 msgbox MauvilleCity_PokemonCenter_1F_Text_1B0AED, 4 @@ -51,12 +51,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AE7F1:: @ 81AE7F1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE83B msgbox MauvilleCity_PokemonCenter_1F_Text_1B0BD0, 4 setvar 0x8004, 1 - special 103 + special sub_80F7C54 pause 60 msgbox MauvilleCity_PokemonCenter_1F_Text_1B0BFA, 5 compare RESULT, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7F1 - special 99 + special sub_80F7B40 msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C23, 4 release end diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index fcf32d15d..1bbe7d355 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,5 +1,5 @@ BerryTreeScript:: @ 81A14DD - special 43 + special FieldObjectInteractionGetBerryTreeData switch 0x8004 case 255, Route102_EventScript_1A1533 case 0, Route102_EventScript_1A153D @@ -21,7 +21,7 @@ Route102_EventScript_1A1533:: @ 81A1533 Route102_EventScript_1A153D:: @ 81A153D lock faceplayer - specialval RESULT, 49 + specialval RESULT, PlayerHasBerries compare RESULT, 1 jumpeq Route102_EventScript_1A1558 message Route102_Text_1A16B6 @@ -41,7 +41,7 @@ Route102_EventScript_1A1558:: @ 81A1558 Route102_EventScript_1A1577:: @ 81A1577 fadescreen 1 closebutton - special 44 + special sub_80B4EE4 waitstate compare ITEM_ID, 0 jumpeq Route102_EventScript_1A1593 @@ -108,10 +108,10 @@ Route102_EventScript_1A15F9:: @ 81A15F9 jumpeq Route102_EventScript_1A164B Route102_EventScript_1A161D:: @ 81A161D - special 46 + special FieldObjectInteractionPickBerryTree compare 0x8004, 0 jumpeq Route102_EventScript_1A1642 - special 47 + special FieldObjectInteractionRemoveBerryTree message Route102_Text_1A17FD fanfare 387 waittext @@ -139,7 +139,7 @@ Route102_EventScript_1A164B:: @ 81A164B gUnknown_081A1654:: @ 81A1654 lockall - special 43 + special FieldObjectInteractionGetBerryTreeData call Route102_EventScript_1A16A9 releaseall end @@ -159,14 +159,14 @@ Route102_EventScript_1A168D:: @ 81A168D end gUnknown_081A168F:: @ 81A168F - special 43 + special FieldObjectInteractionGetBerryTreeData lockall Route102_EventScript_1A1693:: @ 81A1693 message Route102_Text_1A1912 waittext - special 48 - special 94 + special FieldObjectInteractionWaterBerryTree + special DoWateringBerryTreeAnim waitstate message Route102_Text_1A1925 waittext @@ -175,7 +175,7 @@ Route102_EventScript_1A1693:: @ 81A1693 end Route102_EventScript_1A16A9:: @ 81A16A9 - special 45 + special FieldObjectInteractionPlantBerryTree inccounter GAME_STAT_PLANTED_BERRIES message Route102_Text_1A16FB waittext diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index c8f701d95..4a919c597 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -86,7 +86,7 @@ VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88 .2byte 0 OldaleTown_PokemonCenter_2F_EventScript_1A3DB2:: @ 81A3DB2 - special 31 + special CloseLink setvar 0x4087, 0 move 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmove 0 @@ -99,7 +99,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DD9:: @ 81A3DD9 return OldaleTown_PokemonCenter_2F_EventScript_1A3DDA:: @ 81A3DDA - special 31 + special CloseLink setvar 0x4087, 0 compare 0x8007, 0 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C @@ -120,13 +120,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E17:: @ 81A3E17 lockall call OldaleTown_PokemonCenter_2F_EventScript_1A3E30 setmaptile 8, 3, 605, 1 - special 142 + special DrawWholeMapView hidebox 0, 0, 29, 19 releaseall end OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 - special 31 + special CloseLink setvar 0x4087, 0 compare 0x8007, 0 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C @@ -148,14 +148,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 OldaleTown_PokemonCenter_2F_EventScript_1A3E7B:: @ 81A3E7B call OldaleTown_PokemonCenter_2F_EventScript_1A3DB2 setmaptile 11, 3, 605, 1 - special 142 + special DrawWholeMapView end OldaleTown_PokemonCenter_2F_EventScript_1A3E8D:: @ 81A3E8D lockall call OldaleTown_PokemonCenter_2F_EventScript_1A3DDA setmaptile 5, 3, 605, 1 - special 142 + special DrawWholeMapView hidebox 0, 0, 29, 19 releaseall end @@ -199,7 +199,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waittext - special 28 + special sub_808347C waitstate compare RESULT, 1 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A3F5E @@ -215,14 +215,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E - special 0 - special 39 - special 331 + special HealPlayerParty + special SavePlayerParty + special LoadPlayerBag copyvar 0x4087, 0x8004 message2 OldaleTown_PokemonCenter_2F_Text_1A4A22 waittext setmaptile 5, 3, 514, 0 - special 142 + special DrawWholeMapView pause 60 move LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmove 0 @@ -239,16 +239,16 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E release compare 0x8004, 5 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A3FCD - special 1 + special SetCableClubWarp warp SingleBattleColosseum, 255, 6, 8 - special 2 + special DoCableClubWarp waitstate end OldaleTown_PokemonCenter_2F_EventScript_1A3FCD:: @ 81A3FCD - special 1 + special SetCableClubWarp warp DoubleBattleColosseum, 255, 5, 8 - special 2 + special DoCableClubWarp waitstate end @@ -280,7 +280,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A403C:: @ 81A403C return OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042 - special 61 + special CheckForAlivePartyMons compare RESULT, 0 jumpif 5, OldaleTown_PokemonCenter_2F_EventScript_1A4056 setvar 0x8004, 2 @@ -304,28 +304,28 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4068:: @ 81A4068 jump OldaleTown_PokemonCenter_2F_EventScript_1A432D OldaleTown_PokemonCenter_2F_EventScript_1A4093:: @ 81A4093 - special 31 + special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4C03 waittext waitbutton jump OldaleTown_PokemonCenter_2F_EventScript_1A40C0 OldaleTown_PokemonCenter_2F_EventScript_1A40A2:: @ 81A40A2 - special 31 + special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4BCC waittext waitbutton jump OldaleTown_PokemonCenter_2F_EventScript_1A40C0 OldaleTown_PokemonCenter_2F_EventScript_1A40B1:: @ 81A40B1 - special 31 + special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B95 waittext waitbutton jump OldaleTown_PokemonCenter_2F_EventScript_1A40C0 OldaleTown_PokemonCenter_2F_EventScript_1A40C0:: @ 81A40C0 - special 31 + special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4C38 waittext waitbutton @@ -366,7 +366,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waittext - special 29 + special sub_80834E4 waitstate compare RESULT, 1 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4166 @@ -387,7 +387,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 message2 OldaleTown_PokemonCenter_2F_Text_1A4A22 waittext setmaptile 8, 3, 514, 0 - special 142 + special DrawWholeMapView pause 60 move LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmove 0 @@ -405,10 +405,10 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 jump OldaleTown_PokemonCenter_2F_EventScript_1A4325 OldaleTown_PokemonCenter_2F_EventScript_1A41BB:: @ 81A41BB - specialval RESULT, 131 + specialval RESULT, CalculatePlayerPartyCount compare RESULT, 2 jumpif 0, OldaleTown_PokemonCenter_2F_EventScript_1A41E1 - specialval RESULT, 339 + specialval RESULT, GetNameOfEnigmaBerryInPlayerParty compare RESULT, 1 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A41EE setvar RESULT, 1 @@ -460,9 +460,9 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waittext - special 30 + special sub_808350C waitstate - special 341 + special sub_80835D8 waitstate compare RESULT, 1 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4294 @@ -485,7 +485,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 message2 OldaleTown_PokemonCenter_2F_Text_1A4A22 waittext setmaptile 11, 3, 514, 0 - special 142 + special DrawWholeMapView pause 60 move LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmove 0 @@ -503,7 +503,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 jump OldaleTown_PokemonCenter_2F_EventScript_1A4325 OldaleTown_PokemonCenter_2F_EventScript_1A42E9:: @ 81A42E9 - special 31 + special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4AC8 waittext waitbutton @@ -511,7 +511,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A42E9:: @ 81A42E9 end OldaleTown_PokemonCenter_2F_EventScript_1A42F5:: @ 81A42F5 - special 31 + special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4A85 waittext waitbutton @@ -519,7 +519,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A42F5:: @ 81A42F5 end OldaleTown_PokemonCenter_2F_EventScript_1A4301:: @ 81A4301 - special 31 + special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4A30 waittext waitbutton @@ -527,7 +527,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4301:: @ 81A4301 end OldaleTown_PokemonCenter_2F_EventScript_1A430D:: @ 81A430D - special 31 + special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B1D waittext waitbutton @@ -535,7 +535,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A430D:: @ 81A430D end OldaleTown_PokemonCenter_2F_EventScript_1A4319:: @ 81A4319 - special 31 + special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B59 waittext waitbutton @@ -543,13 +543,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4319:: @ 81A4319 end OldaleTown_PokemonCenter_2F_EventScript_1A4325:: @ 81A4325 - special 1 - special 2 + special SetCableClubWarp + special DoCableClubWarp waitstate end OldaleTown_PokemonCenter_2F_EventScript_1A432D:: @ 81A432D - special 31 + special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B6C waittext waitbutton @@ -597,7 +597,7 @@ OldaleTown_PokemonCenter_2F_Movement_1A4361:: @ 81A4361 gUnknown_081A4363:: @ 81A4363 lockall - special 196 + special ShowLinkBattleRecords waitbutton hidebox 0, 0, 29, 19 releaseall @@ -605,57 +605,57 @@ gUnknown_081A4363:: @ 81A4363 SingleBattleColosseum_EventScript_1A436F:: @ 81A436F setvar 0x8005, 0 - special 32 + special sub_8083B90 waitstate end SingleBattleColosseum_EventScript_1A4379:: @ 81A4379 setvar 0x8005, 1 - special 32 + special sub_8083B90 waitstate end DoubleBattleColosseum_EventScript_1A4383:: @ 81A4383 fadescreen 1 - special 41 + special sub_80C5568 waitstate compare RESULT, 0 jumpeq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 0 - special 32 + special sub_8083B90 waitstate end DoubleBattleColosseum_EventScript_1A439E:: @ 81A439E fadescreen 1 - special 41 + special sub_80C5568 waitstate compare RESULT, 0 jumpeq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 1 - special 32 + special sub_8083B90 waitstate end DoubleBattleColosseum_EventScript_1A43B9:: @ 81A43B9 fadescreen 1 - special 41 + special sub_80C5568 waitstate compare RESULT, 0 jumpeq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 2 - special 32 + special sub_8083B90 waitstate end DoubleBattleColosseum_EventScript_1A43D4:: @ 81A43D4 fadescreen 1 - special 41 + special sub_80C5568 waitstate compare RESULT, 0 jumpeq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 3 - special 32 + special sub_8083B90 waitstate end @@ -664,31 +664,31 @@ DoubleBattleColosseum_EventScript_1A43EF:: @ 81A43EF TradeCenter_EventScript_1A43F0:: @ 81A43F0 setvar 0x8005, 0 - special 33 + special sub_8083B5C waitstate end TradeCenter_EventScript_1A43FA:: @ 81A43FA setvar 0x8005, 1 - special 33 + special sub_8083B5C waitstate end @ 81A4404 setvar 0x8005, 2 - special 33 + special sub_8083B5C waitstate end @ 81A440E setvar 0x8005, 3 - special 33 + special sub_8083B5C waitstate end RecordCorner_EventScript_1A4418:: @ 81A4418 setvar 0x8005, 0 - special 27 + special sub_80B929C waitstate compare 0x4001, 0 jumpif 5, RecordCorner_EventScript_1A446C @@ -696,7 +696,7 @@ RecordCorner_EventScript_1A4418:: @ 81A4418 RecordCorner_EventScript_1A442D:: @ 81A442D setvar 0x8005, 1 - special 27 + special sub_80B929C waitstate compare 0x4001, 0 jumpif 5, RecordCorner_EventScript_1A446C @@ -704,7 +704,7 @@ RecordCorner_EventScript_1A442D:: @ 81A442D RecordCorner_EventScript_1A4442:: @ 81A4442 setvar 0x8005, 2 - special 27 + special sub_80B929C waitstate compare 0x4001, 0 jumpif 5, RecordCorner_EventScript_1A446C @@ -712,7 +712,7 @@ RecordCorner_EventScript_1A4442:: @ 81A4442 RecordCorner_EventScript_1A4457:: @ 81A4457 setvar 0x8005, 3 - special 27 + special sub_80B929C waitstate compare 0x4001, 0 jumpif 5, RecordCorner_EventScript_1A446C @@ -731,7 +731,7 @@ TradeRoom_ReadTrainerCard1:: @ 81A4479 waittext waitbutton fadescreen 1 - special 42 + special sub_8083BDC waitstate end @@ -740,7 +740,7 @@ TradeRoom_ReadTrainerCard2:: @ 81A4487 waittext waitbutton fadescreen 1 - special 42 + special sub_8083BDC waitstate end @@ -752,40 +752,40 @@ TradeRoom_TooBusyToNotice:: @ 81A4495 end SingleBattleColosseum_EventScript_1A449E:: @ 81A449E - special 295 + special sub_8064EAC message SingleBattleColosseum_Text_1A4D7E waittext waitbutton - special 296 + special sub_8064ED4 closebutton end TradeCenter_EventScript_1A44AD:: @ 81A44AD - special 295 + special sub_8064EAC message TradeCenter_Text_1A4DAB waittext waitbutton - special 296 + special sub_8064ED4 closebutton end RecordCorner_EventScript_1A44BC:: @ 81A44BC compare 0x4000, 0 jumpif 5, RecordCorner_EventScript_1A44D6 - special 295 + special sub_8064EAC message RecordCorner_Text_1A4DD7 waittext waitbutton - special 296 + special sub_8064ED4 closebutton end RecordCorner_EventScript_1A44D6:: @ 81A44D6 - special 295 + special sub_8064EAC message RecordCorner_Text_1A4DF7 waittext waitbutton - special 296 + special sub_8064ED4 closebutton end @@ -799,11 +799,11 @@ TradeRoom_PromptToCancelLink:: @ 81A44E5 TradeRoom_TerminateLink:: @ 81A44FE message2 TradeRoom_TerminatingLink waittext - special 5 + special sub_80839D0 end gUnknown_081A4508:: @ 81A4508 - special 4 - special 3 + special sub_80839A4 + special sub_80810DC waitstate end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index a8b134c0b..1952264d2 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -122,7 +122,7 @@ FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048 choosecontestpkmn compare 0x8004, 255 jumpeq FallarborTown_ContestLobby_EventScript_1A5097 - special 84 + special sub_80C43F4 compare RESULT, 0 jumpeq FallarborTown_ContestLobby_EventScript_1A50C8 compare RESULT, 1 @@ -337,7 +337,7 @@ LinkContestRoom1_EventScript_1A5311:: @ 81A5311 return LinkContestRoom1_EventScript_1A5323:: @ 81A5323 - special 81 + special sub_80C4C64 addvar 0x8006, 1 buffernum 1, 0x8006 lockall @@ -352,7 +352,7 @@ LinkContestRoom1_EventScript_1A5323:: @ 81A5323 releaseall addvar 0x8006, -1 playsfx 15 - special 320 + special ShowContestEntryMonPic call LinkContestRoom1_EventScript_1A535E return @@ -430,7 +430,7 @@ LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5 return LinkContestRoom1_EventScript_1A5455:: @ 81A5455 - special 87 + special sub_80C47A0 compare 0x4088, 1 callif 1, LinkContestRoom1_EventScript_1A555A compare 0x4088, 2 @@ -463,7 +463,7 @@ LinkContestRoom1_EventScript_1A5455:: @ 81A5455 LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB setvar RESULT, 8 - special 340 + special ScriptRandom compare RESULT, 0 callif 1, LinkContestRoom1_EventScript_1A5760 compare RESULT, 1 @@ -725,7 +725,7 @@ LinkContestRoom1_EventScript_1A5880:: @ 81A5880 closebutton release disappear 13 - special 321 + special sub_80C5164 switch 0x8006 case 0, LinkContestRoom1_EventScript_1A58BA case 1, LinkContestRoom1_EventScript_1A58C7 @@ -857,7 +857,7 @@ LinkContestRoom1_EventScript_1A59F2:: @ 81A59F2 return LinkContestRoom1_EventScript_1A59FC:: @ 81A59FC - special 76 + special sub_80C47C0 switch 0x8005 case 0, LinkContestRoom1_EventScript_1A5A31 case 1, LinkContestRoom1_EventScript_1A5A37 @@ -882,8 +882,8 @@ LinkContestRoom1_EventScript_1A5A43:: @ 81A5A43 return LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 - special 79 - special 80 + special sub_80C47F0 + special sub_80C4858 addvar 0x8005, 1 buffernum 1, 0x8005 addvar 0x8005, -1 @@ -1006,7 +1006,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB setvar 0x4001, 0 call LinkContestRoom1_EventScript_1A5A90 pause 30 - special 134 + special sub_80C4CF8 compare 0x8004, 1 jumpeq LinkContestRoom1_EventScript_1A5C46 return @@ -1015,19 +1015,19 @@ LinkContestRoom1_EventScript_1A5BF6:: @ 81A5BF6 inccounter GAME_STAT_WON_CONTEST msgbox LinkContestRoom1_Text_1A6DF1, 3 pause 90 - special 134 + special sub_80C4CF8 compare 0x8004, 1 jumpeq LinkContestRoom1_EventScript_1A5C46 return LinkContestRoom1_EventScript_1A5C12:: @ 81A5C12 - specialval RESULT, 88 + specialval RESULT, sub_80C4440 compare RESULT, 1 jumpeq LinkContestRoom1_EventScript_1A5C23 return LinkContestRoom1_EventScript_1A5C23:: @ 81A5C23 - special 76 + special sub_80C47C0 compare 0x8005, 3 jumpeq LinkContestRoom1_EventScript_1A5C32 return @@ -1052,7 +1052,7 @@ LinkContestRoom1_EventScript_1A5C46:: @ 81A5C46 LinkContestRoom1_EventScript_1A5C4C:: @ 81A5C4C pause 60 call LinkContestRoom1_EventScript_1A5C6A - special 134 + special sub_80C4CF8 compare 0x8004, 1 jumpeq LinkContestRoom1_EventScript_1A5C64 closebutton @@ -1063,8 +1063,8 @@ LinkContestRoom1_EventScript_1A5C64:: @ 81A5C64 return LinkContestRoom1_EventScript_1A5C6A:: @ 81A5C6A - special 77 - special 76 + special sub_80C496C + special sub_80C47C0 comparevars 0x8004, 0x8005 jumpeq LinkContestRoom1_EventScript_1A5C7C return @@ -1110,7 +1110,7 @@ LinkContestRoom1_EventScript_1A5CD8:: @ 81A5CD8 return LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5 - special 76 + special sub_80C47C0 compare 0x8005, 3 jumpeq LinkContestRoom1_EventScript_1A5CFC msgbox LinkContestRoom1_Text_1A6DF1, 3 @@ -1120,7 +1120,7 @@ LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC compare 0x4088, 2 callif 1, LinkContestRoom1_EventScript_1A5C42 inccounter GAME_STAT_WON_CONTEST - specialval RESULT, 88 + specialval RESULT, sub_80C4440 compare RESULT, 0 jumpeq LinkContestRoom1_EventScript_1A5D5B compare CONTEST_RANK, 3 @@ -1141,7 +1141,7 @@ LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B return LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B - special 89 + special sub_80C44C0 inccounter GAME_STAT_RECEIVED_RIBBONS setflag 2107 lockall @@ -1149,7 +1149,7 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B fanfare 370 msgbox LinkContestRoom1_Text_1A6D96, 4 waitfanfare - special 80 + special sub_80C4858 msgbox LinkContestRoom1_Text_1A6DAC, 4 releaseall return diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 1e248ba9f..b5b3d4670 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -1,8 +1,8 @@ Route117_EventScript_1B222D:: @ 81B222D lock faceplayer - special 181 - specialval RESULT, 182 + special sp0B5_daycare + specialval RESULT, sp0B6_daycare compare RESULT, 1 jumpeq Route117_EventScript_1B2262 compare RESULT, 2 @@ -22,12 +22,12 @@ Route117_EventScript_1B2262:: @ 81B2262 jumpeq Route117_EventScript_1B2298 msgbox Route117_Text_1B2745, 4 clearflag 134 - special 183 + special sub_8041E7C release end Route117_EventScript_1B2298:: @ 81B2298 - specialval RESULT, 131 + specialval RESULT, CalculatePlayerPartyCount compare RESULT, 6 jumpif 5, Route117_EventScript_1B22B2 msgbox Route117_Text_1B2766, 4 @@ -41,13 +41,13 @@ Route117_EventScript_1B22B2:: @ 81B22B2 waittext waitbutton msgbox Route117_Text_1B27CD, 4 - special 184 + special sp0B8_daycare clearflag 134 release end Route117_EventScript_1B22CD:: @ 81B22CD - specialval RESULT, 195 + specialval RESULT, sub_8042B4C compare RESULT, 1 callif 1, Route117_EventScript_1B22DE return @@ -57,7 +57,7 @@ Route117_EventScript_1B22DE:: @ 81B22DE return Route117_EventScript_1B22E7:: @ 81B22E7 - special 181 + special sp0B5_daycare msgbox Route117_Text_1B2710, 4 setvar 0x8004, 0 call Route117_EventScript_1B22CD @@ -65,10 +65,10 @@ Route117_EventScript_1B22E7:: @ 81B22E7 end Route117_EventScript_1B22FE:: @ 81B22FE - special 181 + special sp0B5_daycare msgbox Route117_Text_1B2897, 4 - special 185 - special 141 + special sp0B9_daycare_relationship_comment + special ShowFieldMessageStringVar4 waittext waitbutton setvar 0x8004, 0 @@ -81,7 +81,7 @@ Route117_EventScript_1B22FE:: @ 81B22FE Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 lock faceplayer - specialval RESULT, 182 + specialval RESULT, sp0B6_daycare compare RESULT, 1 jumpeq Route117_PokemonDayCare_EventScript_1B2407 compare RESULT, 2 @@ -96,26 +96,26 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 end Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C - specialval RESULT, 132 + specialval RESULT, sub_8095B6C compare RESULT, 1 jumpeq Route117_PokemonDayCare_EventScript_1B23F3 msgbox Route117_PokemonDayCare_Text_1B2947, 4 fadescreen 1 - special 188 + special ChooseSendDaycareMon waitstate compare 0x8004, 255 jumpeq Route117_PokemonDayCare_EventScript_1B23D0 - specialval RESULT, 133 + specialval RESULT, sub_8095C10 compare RESULT, 0 jumpeq Route117_PokemonDayCare_EventScript_1B23FD - specialval 0x8005, 186 + specialval 0x8005, sub_8042328 checksound pokecry 0x8005, 0 msgbox Route117_PokemonDayCare_Text_1B296E, 4 waitpokecry - special 187 + special Daycare_SendPokemon_Special inccounter GAME_STAT_USED_DAYCARE - specialval RESULT, 182 + specialval RESULT, sp0B6_daycare compare RESULT, 2 jumpeq Route117_PokemonDayCare_EventScript_1B23DA release @@ -153,7 +153,7 @@ Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411 return Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A - specialval RESULT, 190 + specialval RESULT, sub_80417B8 compare RESULT, 0 callif 5, Route117_PokemonDayCare_EventScript_1B2411 return @@ -172,14 +172,14 @@ Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B end Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 - specialval RESULT, 131 + specialval RESULT, CalculatePlayerPartyCount compare RESULT, 6 jumpeq Route117_PokemonDayCare_EventScript_1B2539 - specialval RESULT, 182 + specialval RESULT, sp0B6_daycare setvar 0x8004, 0 compare RESULT, 2 jumpeq Route117_PokemonDayCare_EventScript_1B24A8 - special 189 + special ShowDaycareLevelMenu waitstate copyvar 0x8004, RESULT compare RESULT, 2 @@ -188,7 +188,7 @@ Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 end Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8 - special 191 + special sub_8041770 msgbox Route117_PokemonDayCare_Text_1B2B49, 5 compare RESULT, 1 jumpeq Route117_PokemonDayCare_EventScript_1B24C4 @@ -196,7 +196,7 @@ Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8 end Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4 - specialval RESULT, 197 + specialval RESULT, sub_80B7CE8 compare RESULT, 1 jumpeq Route117_PokemonDayCare_EventScript_1B24DE msgbox Route117_PokemonDayCare_Text_1B2A30, 4 @@ -206,15 +206,15 @@ Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4 Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE move 1, Route117_PokemonDayCare_Movement_1B2543 waitmove 0 - specialval RESULT, 192 - special 198 + specialval RESULT, sub_8041648 + special sub_80B7D0C playsfx 95 msgbox Route117_PokemonDayCare_Text_1B2B75, 4 checksound pokecry RESULT, 0 msgbox Route117_PokemonDayCare_Text_1B2B93, 4 waitpokecry - specialval RESULT, 182 + specialval RESULT, sp0B6_daycare compare RESULT, 2 jumpeq Route117_PokemonDayCare_EventScript_1B2520 jump Route117_PokemonDayCare_EventScript_1B23D0 @@ -271,12 +271,12 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 end @ 81B2591 - special 189 + special ShowDaycareLevelMenu waitstate compare RESULT, 2 jumpeq Route117_PokemonDayCare_EventScript_1B23D0 copyvar 0x8004, RESULT - specialval RESULT, 192 + specialval RESULT, sub_8041648 msgbox Route117_PokemonDayCare_Text_1B2B75, 4 msgbox Route117_PokemonDayCare_Text_1B2A76, 4 release @@ -285,7 +285,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 Event_EggHatch:: @ 81B25BC lockall msgbox UnknownString_81B2C68, 4 - special 194 + special EggHatch waitstate releaseall end diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index f008e892b..67a0920fa 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -2,7 +2,7 @@ Route111_EventScript_1AE313:: @ 81AE313 Route118_EventScript_1AE313:: @ 81AE313 Route120_EventScript_1AE313:: @ 81AE313 settrainerflag OPPONENT_GABBY_AND_TY_6 - specialval RESULT, 172 + specialval RESULT, GabbyAndTyGetBattleNum switch RESULT case 0, Route111_EventScript_1AE384 case 1, Route111_EventScript_1AE38A @@ -200,8 +200,8 @@ Route120_EventScript_1AE582:: @ 81AE582 end Route111_EventScript_1AE5A2:: @ 81AE5A2 - special 174 - special 179 + special GabbyAndTyBeforeInterview + special GabbyAndTySetScriptVarsToFieldObjectLocalIds compare FACING, 2 callif 1, Route111_EventScript_1AE5E0 compare FACING, 1 @@ -234,8 +234,8 @@ Route111_EventScript_1AE5FD:: @ 81AE5FD Route111_EventScript_1AE60F:: @ 81AE60F Route118_EventScript_1AE60F:: @ 81AE60F Route120_EventScript_1AE60F:: @ 81AE60F - special 174 - special 179 + special GabbyAndTyBeforeInterview + special GabbyAndTySetScriptVarsToFieldObjectLocalIds compare FACING, 2 callif 1, Route111_EventScript_1AE5E0 compare FACING, 1 @@ -244,11 +244,11 @@ Route120_EventScript_1AE60F:: @ 81AE60F callif 1, Route111_EventScript_1AE5FD checkflag 1 jumpeq Route111_EventScript_1AE73A - specialval RESULT, 177 + specialval RESULT, GabbyAndTyGetLastQuote compare RESULT, 0 jumpeq Route111_EventScript_1AE69F msgbox Route111_Text_1AC10A, 4 - specialval RESULT, 178 + specialval RESULT, sub_80BDD18 switch RESULT case 0, Route111_EventScript_1AE6AD case 1, Route111_EventScript_1AE6BB @@ -310,7 +310,7 @@ Route111_EventScript_1AE6F3:: @ 81AE6F3 compare RESULT, 0 jumpeq Route111_EventScript_1AE72D msgbox Route111_Text_1AC487, 4 - special 173 + special sub_80BDC14 setflag 1 release end diff --git a/data/scripts/giddy.inc b/data/scripts/giddy.inc index 3cd57ad6e..263589fe9 100644 --- a/data/scripts/giddy.inc +++ b/data/scripts/giddy.inc @@ -9,7 +9,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B09EB:: @ 81B09EB end MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C:: @ 81B0A0C - special 106 + special sub_80F7CC8 compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E compare RESULT, 0 @@ -17,7 +17,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C:: @ 81B0A0C end MauvilleCity_PokemonCenter_1F_EventScript_1B0A26:: @ 81B0A26 - special 106 + special sub_80F7CC8 compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A40 compare RESULT, 0 @@ -30,8 +30,8 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B0A40:: @ 81B0A40 end MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E:: @ 81B0A4E - special 105 - special 141 + special sub_80F7CF4 + special ShowFieldMessageStringVar4 waittext yesnobox 20, 8 compare RESULT, 1 diff --git a/data/scripts/hipster.inc b/data/scripts/hipster.inc index 833bb1605..3e24e4868 100644 --- a/data/scripts/hipster.inc +++ b/data/scripts/hipster.inc @@ -3,7 +3,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AE845:: @ 81AE845 faceplayer setflag 2054 msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C5B, 4 - special 100 + special sub_80F7C70 compare RESULT, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE86A msgbox MauvilleCity_PokemonCenter_1F_Text_1B0CA7, 4 @@ -11,7 +11,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AE845:: @ 81AE845 end MauvilleCity_PokemonCenter_1F_EventScript_1AE86A:: @ 81AE86A - special 102 + special sub_80F7C90 compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE882 msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D11, 4 @@ -20,6 +20,6 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AE86A:: @ 81AE86A MauvilleCity_PokemonCenter_1F_EventScript_1AE882:: @ 81AE882 msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D75, 4 - special 101 + special sub_80F7C84 release end diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index e6b6a8f3d..b0ae966ad 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -38,7 +38,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 removeitem ITEM_STORAGE_KEY, 1 setflag 239 call AbandonedShip_Corridors_B1F_EventScript_15E9C0 - special 142 + special DrawWholeMapView releaseall end diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index 4b634106a..8cb2aed22 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -70,7 +70,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 removeitem ITEM_ROOM_1_KEY, 1 setflag 240 call AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 - special 142 + special DrawWholeMapView releaseall end @@ -86,7 +86,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A removeitem ITEM_ROOM_2_KEY, 1 setflag 241 call AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD - special 142 + special DrawWholeMapView releaseall end @@ -102,7 +102,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 removeitem ITEM_ROOM_4_KEY, 1 setflag 242 call AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 - special 142 + special DrawWholeMapView releaseall end @@ -118,7 +118,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 removeitem ITEM_ROOM_6_KEY, 1 setflag 243 call AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 - special 142 + special DrawWholeMapView releaseall end diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index 5e90673fe..5c4c050a0 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -43,7 +43,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B setanimation 1, 10 setanimation 2, 0 doanimation 54 - specialval RESULT, 290 + specialval RESULT, sub_810F4D4 compare RESULT, 0 callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B checkanimation 54 @@ -54,7 +54,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4 end AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 - specialval RESULT, 288 + specialval RESULT, sub_810F488 compare RESULT, 1 jumpeq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA pause 20 @@ -77,7 +77,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB setanimation 1, 3 setanimation 2, 0 doanimation 54 - specialval RESULT, 291 + specialval RESULT, sub_810F4FC compare RESULT, 0 callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B checkanimation 54 @@ -98,7 +98,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 setanimation 1, 6 setanimation 2, 0 doanimation 54 - specialval RESULT, 289 + specialval RESULT, sub_810F4B0 compare RESULT, 0 callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B checkanimation 54 diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc index b2525d62e..a6ccdc43c 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67 AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq AbandonedShip_Rooms2_1F_EventScript_15EA93 msgbox AbandonedShip_Rooms2_1F_Text_198835, 6 @@ -16,7 +16,7 @@ AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93 AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq AbandonedShip_Rooms2_1F_EventScript_15EAD9 msgbox AbandonedShip_Rooms2_1F_Text_198934, 6 diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index f8eba6a9d..7ba7540c4 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -64,7 +64,7 @@ AncientTomb_EventScript_15F050:: @ 815F050 setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE setflag 937 setflag 2145 - special 313 + special StartBattle_Regi waitstate clearflag 2145 release diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index d991b8853..176d8e8e8 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -12,35 +12,35 @@ BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB waitmove 0 BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA - special 232 + special sub_81347F8 reappear 1 move 1, BattleTower_BattleRoom_Movement_160AC0 waitmove 0 - special 234 + special sub_8135474 msgbox 0x20234cc, 4 waittext closebutton - special 0 + special HealPlayerParty setvar 0x8004, 0 setvar 0x8005, 0 - special 236 + special sub_813556C waitstate switch RESULT case 1, BattleTower_BattleRoom_EventScript_160961 - special 40 + special LoadPlayerParty setvar 0x8004, 0 setvar 0x8005, 5 - special 237 + special sub_8135668 setvar 0x8004, 14 - special 237 + special sub_8135668 setvar 0x8004, 3 - special 170 + special sub_810FF60 warp BattleTower_Lobby, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160961:: @ 8160961 setvar 0x8004, 6 - special 237 + special sub_8135668 switch RESULT case 8, BattleTower_BattleRoom_EventScript_160A56 move 1, BattleTower_BattleRoom_Movement_160AC6 @@ -51,12 +51,12 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 move 255, BattleTower_BattleRoom_Movement_160ABC waitmove 0 msgbox BattleTower_BattleRoom_Text_19ACDC, 4 - special 40 - special 39 - special 239 + special LoadPlayerParty + special SavePlayerParty + special sub_8135A14 fanfare 368 waitfanfare - special 0 + special HealPlayerParty BattleTower_BattleRoom_EventScript_1609B2:: @ 81609B2 msgbox BattleTower_BattleRoom_Text_19AD09, 5 @@ -88,25 +88,25 @@ BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C jump BattleTower_BattleRoom_EventScript_1608FA BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 - special 40 + special LoadPlayerParty setvar 0x8004, 0 setvar 0x8005, 4 - special 237 + special sub_8135668 setvar 0x8004, 2 setvar 0x8005, 1 - special 237 + special sub_8135668 setvar 0x8004, 7 - special 237 + special sub_8135668 setvar 0x8004, 14 - special 237 + special sub_8135668 setvar 0x8004, 3 - special 170 + special sub_810FF60 warp BattleTower_Lobby, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 setvar 0x8004, 2 - special 240 + special sub_8135BA0 message BattleTower_BattleRoom_Text_1C6CE1 pause 60 waittext @@ -116,7 +116,7 @@ BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 BattleTower_BattleRoom_EventScript_160AB1:: @ 8160AB1 fadescreen 1 - special 241 + special sub_8135C38 end BattleTower_BattleRoom_Movement_160AB7:: @ 8160AB7 diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index 7a79cc4e9..408e7485e 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -12,7 +12,7 @@ BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 move 1, BattleTower_Elevator_Movement_160835 move 255, BattleTower_Elevator_Movement_160839 waitmove 0 - special 273 + special sub_810EBEC waitstate pause 64 move 1, BattleTower_Elevator_Movement_16083D diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index cee3d7cec..8cd3639a5 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -6,30 +6,30 @@ BattleTower_Lobby_MapScripts:: @ 816027E .byte 0 BattleTower_Lobby_MapScript1_160293:: @ 8160293 - special 338 + special sub_813610C call BattleTower_Lobby_EventScript_16029C end BattleTower_Lobby_EventScript_16029C:: @ 816029C setvar 0x8004, 10 - special 237 + special sub_8135668 checkflag 238 jumpeq BattleTower_Lobby_EventScript_1602E4 checkflag 237 jumpeq BattleTower_Lobby_EventScript_1602CD - specialval 0x8007, 247 + specialval 0x8007, sub_810F404 compare 0x8007, 50 jumpif 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 - special 329 + special sub_810F8FC return BattleTower_Lobby_EventScript_1602CD:: @ 81602CD - specialval 0x8007, 247 + specialval 0x8007, sub_810F404 compare 0x8007, 100 jumpif 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 - special 329 + special sub_810F8FC return BattleTower_Lobby_EventScript_1602E4:: @ 81602E4 @@ -58,7 +58,7 @@ BattleTower_Lobby_MapScript2_160302:: @ 8160302 .2byte 0 BattleTower_Lobby_EventScript_16032C:: @ 816032C - special 231 + special sub_8134548 end BattleTower_Lobby_EventScript_160330:: @ 8160330 @@ -76,10 +76,10 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 message BattleTower_Lobby_Text_19A487 waittext setvar 0x8004, 0 - special 238 + special sub_81358A4 compare RESULT, 6 jumpeq BattleTower_Lobby_EventScript_16037D - special 244 + special sub_8135E50 compare RESULT, 0 jumpeq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE @@ -90,26 +90,26 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 BattleTower_Lobby_EventScript_16037D:: @ 816037D setvar 0x8004, 8 - special 238 + special sub_81358A4 compare RESULT, 1 jumpeq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waittext setvar 0x8004, 13 - special 237 - special 242 + special sub_8135668 + special sub_8135D84 setvar 0x8004, 3 - special 240 + special sub_8135BA0 playsfx 55 checksound BattleTower_Lobby_EventScript_1603AD:: @ 81603AD setvar 0x8004, 0 setvar 0x8005, 3 - special 237 + special sub_8135668 message BattleTower_Lobby_Text_19A4BB waittext - special 243 + special sub_8135DEC switch RESULT case 0, BattleTower_Lobby_EventScript_160408 message BattleTower_Lobby_Text_19A506 @@ -117,7 +117,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD fanfare 370 waitfanfare setvar 0x8004, 9 - special 238 + special sub_81358A4 compare RESULT, 49 jumpif 5, BattleTower_Lobby_EventScript_1603F8 msgbox BattleTower_Lobby_Text_19A617, 4 @@ -145,9 +145,9 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 message BattleTower_Lobby_Text_19A589 waittext setvar 0x8004, 13 - special 237 + special sub_8135668 setvar 0x8004, 0 - special 240 + special sub_8135BA0 playsfx 55 checksound msgbox BattleTower_Lobby_Text_199FA9, 4 @@ -165,15 +165,15 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B message BattleTower_Lobby_Text_19A5CE waittext setvar 0x8004, 1 - special 240 + special sub_8135BA0 playsfx 55 checksound setvar 0x8004, 8 setvar 0x8005, 0 - special 237 + special sub_8135668 setvar 0x4000, 5 - special 39 - special 239 + special SavePlayerParty + special sub_8135A14 msgbox BattleTower_Lobby_Text_19A0A8, 4 closebutton call BattleTower_Lobby_EventScript_160664 @@ -185,10 +185,10 @@ BattleTower_Lobby_EventScript_16049E:: @ 816049E lock faceplayer setvar 0x8004, 0 - special 238 + special sub_81358A4 compare RESULT, 6 jumpeq BattleTower_Lobby_EventScript_160342 - special 39 + special SavePlayerParty msgbox BattleTower_Lobby_Text_199F2C, 4 BattleTower_Lobby_EventScript_1604BE:: @ 81604BE @@ -208,16 +208,16 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA switch RESULT case 2, BattleTower_Lobby_EventScript_160652 case 127, BattleTower_Lobby_EventScript_160652 - special 233 + special CheckPartyBattleTowerBanlist compare 0x8004, 1 jumpeq BattleTower_Lobby_EventScript_16060D setvar 0x8004, 1 copyvar 0x8005, RESULT copyvar 0x8006, RESULT - special 237 + special sub_8135668 msgbox BattleTower_Lobby_Text_19A07B, 4 fadescreen 1 - special 245 + special ChooseBattleTowerPlayerParty waitstate compare RESULT, 0 jumpeq BattleTower_Lobby_EventScript_16064F @@ -229,17 +229,17 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA BattleTower_Lobby_EventScript_160587:: @ 8160587 setvar 0x8004, 5 - special 237 + special sub_8135668 setvar 0x4000, 0 setvar 0x8004, 11 - special 237 + special sub_8135668 setvar 0x8004, 0 setvar 0x8005, 1 - special 237 + special sub_8135668 setvar 0x8004, 8 setvar 0x8005, 0 - special 237 - special 40 + special sub_8135668 + special LoadPlayerParty closebutton pause 2 call BattleTower_Lobby_EventScript_19F806 @@ -248,8 +248,8 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 compare RESULT, 0 jumpeq BattleTower_Lobby_EventScript_160642 inccounter GAME_STAT_ENTERED_BATTLE_TOWER - special 39 - special 239 + special SavePlayerParty + special sub_8135A14 setvar 0x40bc, 1 msgbox BattleTower_Lobby_Text_19A0A8, 4 closebutton @@ -277,16 +277,16 @@ BattleTower_Lobby_EventScript_160635:: @ 8160635 BattleTower_Lobby_EventScript_160642:: @ 8160642 setvar 0x8004, 12 - special 237 + special sub_8135668 jump BattleTower_Lobby_EventScript_160652 BattleTower_Lobby_EventScript_16064F:: @ 816064F - special 40 + special LoadPlayerParty BattleTower_Lobby_EventScript_160652:: @ 8160652 msgbox BattleTower_Lobby_Text_199FA9, 4 setvar 0x8004, 11 - special 237 + special sub_8135668 BattleTower_Lobby_EventScript_160662:: @ 8160662 release @@ -378,7 +378,7 @@ BattleTower_Lobby_EventScript_16071E:: @ 816071E BattleTower_Lobby_EventScript_160727:: @ 8160727 lockall - special 283 + special ShowBattleTowerRecords waitbutton hidebox 0, 0, 29, 19 releaseall @@ -402,7 +402,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 end BattleTower_Lobby_EventScript_160773:: @ 8160773 - specialval RESULT, 247 + specialval RESULT, sub_810F404 compare RESULT, 100 jumpif 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index e9f23ff5a..023892d36 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -35,7 +35,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 closebutton setweather 0 doweather - special 284 + special WaitWeather waitstate playsfx 209 setanimation 0, 9 @@ -49,9 +49,9 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 setvar RESULT, 2 .endif playsfx 107 - special 281 + special sub_80818A4 waitstate - special 282 + special sub_80818FC waitstate move 1, CaveOfOrigin_B4F_Movement_15DE7D waitmove 0 @@ -62,10 +62,10 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 pause 40 waitpokecry setflag 2145 - special 311 + special StartBattle_GroudonKyogre waitstate clearflag 2145 - specialval RESULT, 180 + specialval RESULT, sub_810E300 compare RESULT, 1 callif 1, CaveOfOrigin_B4F_EventScript_15DE73 setflag 816 diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index d5787d792..df40fc126 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -64,7 +64,7 @@ DesertRuins_EventScript_15CB85:: @ 815CB85 setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE setflag 935 setflag 2145 - special 313 + special StartBattle_Regi waitstate clearflag 2145 release diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 0b25e0aba..28d396a3e 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -5,7 +5,7 @@ DewfordTown_Hall_EventScript_153293:: @ 8153293 lock faceplayer call DewfordTown_Hall_EventScript_1A0102 - special 127 + special sub_80FA5E4 compare RESULT, 1 jumpeq DewfordTown_Hall_EventScript_1532B2 msgbox DewfordTown_Hall_Text_1754C9, 4 @@ -29,7 +29,7 @@ DewfordTown_Hall_EventScript_1532CD:: @ 81532CD lock faceplayer call DewfordTown_Hall_EventScript_1A0102 - special 128 + special sub_80EB83C msgbox DewfordTown_Hall_Text_1755F9, 5 compare RESULT, 1 jumpeq DewfordTown_Hall_EventScript_1532F6 @@ -87,7 +87,7 @@ DewfordTown_Hall_EventScript_153353:: @ 8153353 DewfordTown_Hall_EventScript_153363:: @ 8153363 lockall call DewfordTown_Hall_EventScript_1A0102 - special 129 + special sub_80FA648 switch RESULT case 0, DewfordTown_Hall_EventScript_1533CA case 4, DewfordTown_Hall_EventScript_1533CA @@ -133,7 +133,7 @@ DewfordTown_Hall_EventScript_1533FE:: @ 81533FE DewfordTown_Hall_EventScript_15340A:: @ 815340A call DewfordTown_Hall_EventScript_1A0102 - special 129 + special sub_80FA648 switch RESULT case 0, DewfordTown_Hall_EventScript_153470 case 1, DewfordTown_Hall_EventScript_153470 diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 0e5dc21b0..bddcfa74b 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -48,7 +48,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 playsfx 8 setmaptile 6, 1, 838, 0 setmaptile 6, 2, 839, 0 - special 142 + special DrawWholeMapView msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4 closebutton playsfx 8 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index c16bd544f..d10957a8e 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -56,7 +56,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795 setvar 0x8004, 0 - special 170 + special sub_810FF60 setflag 1248 call EverGrandeCity_DrakesRoom_EventScript_1A0693 msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4 diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 2e7099110..175990328 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -53,7 +53,7 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41 sethealplace 1 fadescreendelay 1, 24 - special 272 + special GameClear waitstate releaseall end @@ -61,7 +61,7 @@ EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41 EverGrandeCity_HallOfFame_EventScript_15BC4D:: @ 815BC4D sethealplace 2 fadescreendelay 1, 24 - special 272 + special GameClear waitstate releaseall end diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index 706d9aa5f..ed67d922d 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -11,7 +11,7 @@ FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD setvar CONTEST_RANK, 1 call FallarborTown_ContestLobby_EventScript_1A4E92 call FallarborTown_ContestLobby_EventScript_1539F8 - special 83 + special sub_80C4BF0 call FallarborTown_ContestLobby_EventScript_15FBDB setvar 0x4088, 2 warp LinkContestRoom1, 255, 7, 5 @@ -25,13 +25,13 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 playsfx 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 - special 142 + special DrawWholeMapView move 1, FallarborTown_ContestLobby_Movement_153A7F waitmove 0 playsfx 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 - special 142 + special DrawWholeMapView pause 20 move 1, FallarborTown_ContestLobby_Movement_153A8C waitmove 0 @@ -114,7 +114,7 @@ FallarborTown_ContestLobby_EventScript_153ABB:: @ 8153ABB FallarborTown_ContestLobby_EventScript_153AC2:: @ 8153AC2 lockall - special 259 + special ShowBerryBlenderRecordWindow waitbutton hidebox 0, 0, 29, 19 releaseall diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 179f281af..1351b96d3 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -24,11 +24,11 @@ FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 msgbox FallarborTown_House2_Text_177C3F, 4 - special 219 + special sub_80F9A4C waitstate compare 0x8004, 255 jumpeq FallarborTown_House2_EventScript_153D60 - special 328 + special sub_80FA148 compare RESULT, 1 jumpeq FallarborTown_House2_EventScript_153D52 compare 0x8005, 0 @@ -38,7 +38,7 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 FallarborTown_House2_EventScript_153D1A:: @ 8153D1A msgbox FallarborTown_House2_Text_177C5D, 4 - special 224 + special sub_8132670 waitstate compare 0x8004, 0 jumpeq FallarborTown_House2_EventScript_153CE4 diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 1bf6b0825..44f5890a2 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -4,7 +4,7 @@ FortreeCity_Gym_MapScripts:: @ 8157ED3 .byte 0 FortreeCity_Gym_MapScript1_157EDE:: @ 8157EDE - special 201 + special RotatingGate_InitPuzzle end FortreeCity_Gym_MapScript2_157EE2:: @ 8157EE2 @@ -12,7 +12,7 @@ FortreeCity_Gym_MapScript2_157EE2:: @ 8157EE2 .2byte 0 FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC - special 202 + special RotatingGate_InitPuzzleAndGraphics end FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 0ae6e3fbd..f5bda05ab 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -8,25 +8,25 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 jumpeq FortreeCity_House1_EventScript_157EAD setvar 0x8008, 1 copyvar 0x8004, 0x8008 - specialval RESULT, 252 + specialval RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox FortreeCity_House1_Text_18568C, 5 compare RESULT, 0 jumpeq FortreeCity_House1_EventScript_157E95 - special 159 + special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 compare 0x8004, 255 jumpeq FortreeCity_House1_EventScript_157E95 copyvar 0x8005, 0x800a - specialval RESULT, 255 + specialval RESULT, sub_804DB2C copyvar 0x800b, RESULT comparevars RESULT, 0x8009 jumpif 5, FortreeCity_House1_EventScript_157E9F copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a - special 253 - special 254 + special sub_804DB68 + special sub_804E174 waitstate bufferpoke 0, 0x8009 msgbox FortreeCity_House1_Text_1856F7, 4 diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index c5d932a91..b16f386d8 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -38,7 +38,7 @@ gIslandCave_EventScript_OpenRegiiceChamber:: @ 815EF19 setmaptile 7, 20, 562, 1 setmaptile 8, 20, 563, 0 setmaptile 9, 20, 564, 1 - special 142 + special DrawWholeMapView playsfx SE_BAN setflag 2129 end @@ -48,7 +48,7 @@ IslandCave_EventScript_15EF59:: @ 815EF59 checkflag 2129 jumpeq IslandCave_EventScript_15EF72 braillemsg IslandCave_Braille_1C54FC - special 280 + special DoBrailleWait waitstate jump IslandCave_EventScript_15EF95 end @@ -63,7 +63,7 @@ IslandCave_EventScript_15EF7C:: @ 815EF7C braillemsg IslandCave_Braille_1C54FC checkflag 2129 jumpeq IslandCave_EventScript_15EF95 - special 280 + special DoBrailleWait waitstate jump IslandCave_EventScript_15EF95 end @@ -84,7 +84,7 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D setwildbattle SPECIES_REGICE, 40, ITEM_NONE setflag 936 setflag 2145 - special 313 + special StartBattle_Regi waitstate clearflag 2145 release diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 3ae0882c5..151f1ec79 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -24,7 +24,7 @@ JaggedPass_EventScript_15D285:: @ 815D285 JaggedPass_EventScript_15D29C:: @ 815D29C trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq JaggedPass_EventScript_15D2C3 msgbox JaggedPass_Text_195F04, 6 @@ -37,7 +37,7 @@ JaggedPass_EventScript_15D2C3:: @ 815D2C3 JaggedPass_EventScript_15D2DA:: @ 815D2DA trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq JaggedPass_EventScript_15D301 msgbox JaggedPass_Text_196077, 6 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index a71bd4854..685e44d58 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -236,7 +236,7 @@ LavaridgeTown_Movement_14E70E:: @ 814E70E step_end LavaridgeTown_EventScript_14E710:: @ 814E710 - specialval RESULT, 287 + specialval RESULT, player_get_direction_lower_nybble compare RESULT, 1 jumpeq LavaridgeTown_EventScript_14E721 end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index ae36e33b5..b688107ce 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -172,7 +172,7 @@ LilycoveCity_EventScript_14CC79:: @ 814CC79 LilycoveCity_EventScript_14CC82:: @ 814CC82 lockall - specialval 0x8004, 137 + specialval 0x8004, sub_80C4D50 switch 0x8004 case 0, LilycoveCity_EventScript_14CCA2 msgbox LilycoveCity_Text_168EA4, 4 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 419e04a8f..3c8cc5bdf 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -41,9 +41,9 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE msgbox LilycoveCity_ContestLobby_Text_188AE8, 4 closebutton - special 135 + special sub_80C4CEC setvar 0x4099, 0 - specialval RESULT, 91 + specialval RESULT, GiveMonArtistRibbon compare RESULT, 1 callif 1, LilycoveCity_ContestLobby_EventScript_158948 move 4, LilycoveCity_ContestLobby_Movement_158A43 @@ -69,7 +69,7 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 inccounter GAME_STAT_RECEIVED_RIBBONS - special 80 + special sub_80C4858 move 4, LilycoveCity_ContestLobby_Movement_158A4E waitmove 0 playsfx 21 @@ -87,7 +87,7 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 return LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994 - specialval 0x8004, 137 + specialval 0x8004, sub_80C4D50 switch 0x8004 case 1, LilycoveCity_ContestLobby_EventScript_1589D6 case 2, LilycoveCity_ContestLobby_EventScript_1589DA @@ -214,9 +214,9 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE msgbox LilycoveCity_ContestLobby_Text_188AE8, 4 closebutton - special 135 + special sub_80C4CEC setvar 0x4099, 0 - specialval RESULT, 91 + specialval RESULT, GiveMonArtistRibbon compare RESULT, 1 callif 1, LilycoveCity_ContestLobby_EventScript_158B18 move 11, LilycoveCity_ContestLobby_Movement_158B6D @@ -242,7 +242,7 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 inccounter GAME_STAT_RECEIVED_RIBBONS - special 80 + special sub_80C4858 move 11, LilycoveCity_ContestLobby_Movement_158B78 waitmove 0 playsfx 21 @@ -363,7 +363,7 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 choosecontestpkmn compare 0x8004, 255 jumpeq LilycoveCity_ContestLobby_EventScript_158CEA - special 84 + special sub_80C43F4 compare RESULT, 0 jumpeq LilycoveCity_ContestLobby_EventScript_158C96 compare RESULT, 1 @@ -418,7 +418,7 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 message LilycoveCity_ContestLobby_Text_1887C7 waittext copyvar 0x8004, RESULT - special 92 + special sub_808363C waitstate compare RESULT, 3 jumpeq LilycoveCity_ContestLobby_EventScript_158D90 @@ -441,7 +441,7 @@ LilycoveCity_ContestLobby_EventScript_158D82:: @ 8158D82 end LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90 - special 31 + special CloseLink msgbox LilycoveCity_ContestLobby_Text_18878D, 4 closebutton releaseall @@ -449,7 +449,7 @@ LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90 end LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1 - special 31 + special CloseLink msgbox LilycoveCity_ContestLobby_Text_1887F4, 4 closebutton releaseall @@ -457,7 +457,7 @@ LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1 end LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2 - special 31 + special CloseLink msgbox LilycoveCity_ContestLobby_Text_18881F, 4 closebutton releaseall @@ -470,7 +470,7 @@ LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 end LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 - special 77 + special sub_80C496C addvar 0x8004, 1 buffernum 1, 32772 message2 LilycoveCity_ContestLobby_Text_188845 @@ -482,7 +482,7 @@ LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE call LilycoveCity_ContestLobby_EventScript_158E0B setvar 0x4086, 1 - special 86 + special sub_80C4F70 setvar 0x4088, 5 setvar CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_158F08 @@ -499,13 +499,13 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B playsfx 71 setmaptile 9, 2, 545, 1 setmaptile 9, 3, 609, 1 - special 142 + special DrawWholeMapView move 2, LilycoveCity_ContestLobby_Movement_158EA0 waitmove 0 playsfx 71 setmaptile 9, 2, 721, 1 setmaptile 9, 3, 729, 1 - special 142 + special DrawWholeMapView pause 20 move 2, LilycoveCity_ContestLobby_Movement_158EAE waitmove 0 @@ -568,14 +568,14 @@ LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE step_end LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 - specialval RESULT, 90 + specialval RESULT, sub_80C5044 compare RESULT, 1 jumpeq LilycoveCity_ContestLobby_EventScript_158EE8 setvar 0x800b, 8 setvar CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_1A4E92 call LilycoveCity_ContestLobby_EventScript_158F86 - special 83 + special sub_80C4BF0 call LilycoveCity_ContestLobby_EventScript_15FBDB setvar 0x4088, 4 call LilycoveCity_ContestLobby_EventScript_158F08 @@ -603,31 +603,31 @@ LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08 LilycoveCity_ContestLobby_EventScript_158F45:: @ 8158F45 warp3 LinkContestRoom4, 255, 7, 5 - special 300 + special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F52:: @ 8158F52 warp3 LinkContestRoom2, 255, 7, 5 - special 300 + special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F5F:: @ 8158F5F warp3 LinkContestRoom6, 255, 7, 5 - special 300 + special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F6C:: @ 8158F6C warp3 LinkContestRoom5, 255, 7, 5 - special 300 + special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F79:: @ 8158F79 warp3 LinkContestRoom3, 255, 7, 5 - special 300 + special sub_8081334 waitstate return @@ -638,13 +638,13 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 playsfx 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 - special 142 + special DrawWholeMapView move 1, LilycoveCity_ContestLobby_Movement_15900F waitmove 0 playsfx 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 - special 142 + special DrawWholeMapView pause 20 move 1, LilycoveCity_ContestLobby_Movement_15901C waitmove 0 @@ -764,7 +764,7 @@ LilycoveCity_ContestLobby_EventScript_159084:: @ 8159084 LilycoveCity_ContestLobby_EventScript_15908D:: @ 815908D SlateportCity_ContestLobby_EventScript_15908D:: @ 815908D lockall - special 259 + special ShowBerryBlenderRecordWindow waitbutton hidebox 0, 0, 29, 19 releaseall diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index d2a86e0a5..dcf74b77c 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -8,7 +8,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 callif 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 checkflag 2 callif 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD - specialval RESULT, 335 + specialval RESULT, sub_8090FC0 compare RESULT, 1 jumpeq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 release @@ -29,7 +29,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD message LilycoveCity_CoveLilyMotel_2F_Text_18708F waittext call LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5 - special 264 + special sub_810D6A4 waitstate release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index c82cc6428..74b746633 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C checkflag 2 callif 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF copyvar 0x8005, 0x4043 - special 306 + special sub_810E944 message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 waittext multichoice 0, 0, 57, 0 @@ -74,11 +74,11 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8 hidebox 0, 0, 29, 19 move LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845 waitmove 0 - special 273 + special sub_810EBEC waitstate setflag 2 return LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF:: @ 815A4CF - special 216 + special SetDepartmentStoreFloorVar return diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 325c56330..feff49c42 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -19,17 +19,17 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E setflag 2250 message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 waittext - special 257 + special RetrieveLotteryNumber copyvar 0x8008, RESULT - special 337 + special sub_810F9AC msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 move 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 waitmove 0 playsfx 4 - special 217 - special 258 + special DoLotteryCornerComputerEffect + special PickLotteryCornerTicket pause 220 - special 218 + special EndLotteryCornerComputerEffect pause 10 move 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 waitmove 0 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 2f4e4352e..f8ff8f9f3 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -135,7 +135,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE callif 1, LilycoveCity_Harbor_EventScript_1599CE pause 30 spriteinvisible 255, 0, 0 - special 0 + special HealPlayerParty setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E warp SouthernIsland_Exterior, 255, 13, 22 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 2e6d6698f..b3564ebf5 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -98,7 +98,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall checkflag 236 jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_158793 - specialval 0x8004, 137 + specialval 0x8004, sub_80C4D50 switch 0x8004 case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index c9b026060..6adea2eb2 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -14,23 +14,23 @@ LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4 - special 159 + special sub_80F9A0C waitstate compare 0x8004, 255 jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B7B - special 328 + special sub_80FA148 compare RESULT, 1 jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B71 - special 223 + special sub_80F9F3C compare RESULT, 1 jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B64 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4 fadescreen 1 - special 220 + special sub_80F9EEC fadescreen 0 compare 0x8005, 4 jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159ADE - special 222 + special sub_80F9F84 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 switch RESULT case 1, LilycoveCity_MoveDeletersHouse_EventScript_159B53 @@ -39,7 +39,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE end LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 - special 221 + special sub_80FA0DC fanfare 378 waitfanfare msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4 @@ -47,7 +47,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 end LilycoveCity_MoveDeletersHouse_EventScript_159B64:: @ 8159B64 - special 222 + special sub_80F9F84 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6D0, 4 releaseall end diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 9ac66f98e..e503ef4ec 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -68,37 +68,37 @@ LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 end LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 - special 167 + special sub_810FCE8 setvar 0x8004, 8 - specialval RESULT, 163 + specialval RESULT, sub_810FD60 compare RESULT, 0 callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 setvar 0x8004, 9 - specialval RESULT, 163 + specialval RESULT, sub_810FD60 compare RESULT, 0 callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD setvar 0x8004, 10 - specialval RESULT, 163 + specialval RESULT, sub_810FD60 compare RESULT, 0 callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 setvar 0x8004, 11 - specialval RESULT, 163 + specialval RESULT, sub_810FD60 compare RESULT, 0 callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED setvar 0x8004, 12 - specialval RESULT, 163 + specialval RESULT, sub_810FD60 compare RESULT, 0 callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 setvar 0x8004, 13 - specialval RESULT, 163 + specialval RESULT, sub_810FD60 compare RESULT, 0 callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD setvar 0x8004, 14 - specialval RESULT, 163 + specialval RESULT, sub_810FD60 compare RESULT, 0 callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 setvar 0x8004, 15 - specialval RESULT, 163 + specialval RESULT, sub_810FD60 compare RESULT, 0 callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D end @@ -147,13 +147,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F lock faceplayer setvar 0x8004, 13 - special 165 + special sub_810FDAC compare 0x4095, 0 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C - specialval RESULT, 163 + specialval RESULT, sub_810FD60 compare RESULT, 1 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E - specialval RESULT, 164 + specialval RESULT, sub_810FCB0 compare RESULT, 7 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159592 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4 @@ -161,7 +161,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F end LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E - specialval RESULT, 164 + specialval RESULT, sub_810FCB0 compare RESULT, 1 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4 @@ -187,13 +187,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 lock faceplayer setvar 0x8004, 8 - special 165 + special sub_810FDAC compare 0x4095, 0 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 - specialval RESULT, 163 + specialval RESULT, sub_810FD60 compare RESULT, 1 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 - specialval RESULT, 164 + specialval RESULT, sub_810FCB0 compare RESULT, 7 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159609 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4 @@ -201,7 +201,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 end LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5 - specialval RESULT, 164 + specialval RESULT, sub_810FCB0 compare RESULT, 1 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4 @@ -227,13 +227,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D lock faceplayer setvar 0x8004, 9 - special 165 + special sub_810FDAC compare 0x4095, 0 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A - specialval RESULT, 163 + specialval RESULT, sub_810FD60 compare RESULT, 1 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C - specialval RESULT, 164 + specialval RESULT, sub_810FCB0 compare RESULT, 7 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159680 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4 @@ -241,7 +241,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D end LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C - specialval RESULT, 164 + specialval RESULT, sub_810FCB0 compare RESULT, 1 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4 @@ -267,13 +267,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 lock faceplayer setvar 0x8004, 10 - special 165 + special sub_810FDAC compare 0x4095, 0 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 - specialval RESULT, 163 + specialval RESULT, sub_810FD60 compare RESULT, 1 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 - specialval RESULT, 164 + specialval RESULT, sub_810FCB0 compare RESULT, 7 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4 @@ -281,7 +281,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 end LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3 - specialval RESULT, 164 + specialval RESULT, sub_810FCB0 compare RESULT, 1 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4 @@ -307,11 +307,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B lock faceplayer setvar 0x8004, 11 - special 165 - specialval RESULT, 163 + special sub_810FDAC + specialval RESULT, sub_810FD60 compare RESULT, 1 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F - specialval RESULT, 164 + specialval RESULT, sub_810FCB0 compare RESULT, 7 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159763 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4 @@ -319,7 +319,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B end LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F - specialval RESULT, 164 + specialval RESULT, sub_810FCB0 compare RESULT, 1 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4 @@ -340,11 +340,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D lock faceplayer setvar 0x8004, 12 - special 165 - specialval RESULT, 163 + special sub_810FDAC + specialval RESULT, sub_810FD60 compare RESULT, 1 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 - specialval RESULT, 164 + specialval RESULT, sub_810FCB0 compare RESULT, 7 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4 @@ -352,7 +352,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D end LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1 - specialval RESULT, 164 + specialval RESULT, sub_810FCB0 compare RESULT, 1 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4 @@ -373,11 +373,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF lock faceplayer setvar 0x8004, 14 - special 165 - specialval RESULT, 163 + special sub_810FDAC + specialval RESULT, sub_810FD60 compare RESULT, 1 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 - specialval RESULT, 164 + specialval RESULT, sub_810FCB0 compare RESULT, 7 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159827 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4 @@ -385,7 +385,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF end LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803 - specialval RESULT, 164 + specialval RESULT, sub_810FCB0 compare RESULT, 1 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4 @@ -406,11 +406,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 lock faceplayer setvar 0x8004, 15 - special 165 - specialval RESULT, 163 + special sub_810FDAC + specialval RESULT, sub_810FD60 compare RESULT, 1 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 - specialval RESULT, 164 + specialval RESULT, sub_810FCB0 compare RESULT, 7 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159889 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4 @@ -418,7 +418,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 end LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865 - specialval RESULT, 164 + specialval RESULT, sub_810FCB0 compare RESULT, 1 jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 81692acc5..2a4f77529 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -207,7 +207,7 @@ LittlerootTown_EventScript_14D708:: @ 814D708 end LittlerootTown_EventScript_14D722:: @ 814D722 - special 148 + special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_16ADF2, 4 release end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 9816734d0..69206566a 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -98,7 +98,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 move 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F move 4, LittlerootTown_BrendansHouse_1F_Movement_152782 waitmove 0 - special 149 + special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, 4 setflag 87 setvar 0x4082, 2 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 0c6ec79f7..0803cd512 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -59,10 +59,10 @@ LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 setvar 0x8004, 1 - special 214 + special DoPCTurnOnEffect playsfx SE_PC_ON msgbox LittlerootTown_BrendansHouse_2F_Text_1A10D6, 4 - special 249 + special BedroomPC waitstate releaseall end @@ -70,7 +70,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 gBrendanHouse_TurnPCOff:: @ 8152850 setvar 0x8004, 1 playsfx SE_PC_OFF - special 215 + special DoPCTurnOffEffect releaseall end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 2b9ad42ef..5f7f20d63 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -98,7 +98,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 move 255, LittlerootTown_MaysHouse_1F_Movement_1A0843 move 4, LittlerootTown_MaysHouse_1F_Movement_1529C0 waitmove 0 - special 149 + special GetRivalSonDaughterString msgbox LittlerootTown_MaysHouse_1F_Text_1730C2, 4 setflag 87 setvar 0x408c, 2 @@ -141,7 +141,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB jumpeq LittlerootTown_BrendansHouse_1F_EventScript_152A17 compare 0x408d, 3 jumpeq LittlerootTown_BrendansHouse_1F_EventScript_152A2B - special 149 + special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1731C6, 4 release end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 1aca3f86e..85a41caff 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -207,10 +207,10 @@ LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52 LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C setvar 0x8004, 2 - special 214 + special DoPCTurnOnEffect playsfx SE_PC_ON msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4 - special 249 + special BedroomPC waitstate releaseall end @@ -218,6 +218,6 @@ LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C gMayHouse_TurnPCOff:: @ 8152C75 setvar 0x8004, 2 playsfx SE_PC_OFF - special 215 + special DoPCTurnOffEffect releaseall end diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index cb3b8505b..5436bf38a 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -58,7 +58,7 @@ MauvilleCity_BikeShop_EventScript_156847:: @ 8156847 MauvilleCity_BikeShop_EventScript_156861:: @ 8156861 msgbox MauvilleCity_BikeShop_Text_181362, 4 - special 130 + special SwapRegisteredBike release end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index a0aab4238..f20a7dacd 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -525,7 +525,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 compare RESULT, 0 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 - specialval RESULT, 286 + specialval RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -536,7 +536,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 compare RESULT, 0 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 - specialval RESULT, 286 + specialval RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -547,7 +547,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 compare RESULT, 0 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 2 - specialval RESULT, 286 + specialval RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -558,7 +558,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 compare RESULT, 0 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 3 - specialval RESULT, 286 + specialval RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -569,7 +569,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 compare RESULT, 0 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 4 - specialval RESULT, 286 + specialval RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -580,7 +580,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 compare RESULT, 0 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 5 - specialval RESULT, 286 + specialval RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -591,7 +591,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 compare RESULT, 0 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 6 - specialval RESULT, 286 + specialval RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -602,7 +602,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 compare RESULT, 0 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 7 - specialval RESULT, 286 + specialval RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -613,7 +613,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 compare RESULT, 0 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 8 - specialval RESULT, 286 + specialval RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -624,7 +624,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 compare RESULT, 0 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 9 - specialval RESULT, 286 + specialval RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -635,7 +635,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 compare RESULT, 0 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 10 - specialval RESULT, 286 + specialval RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -646,7 +646,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 compare RESULT, 0 jumpeq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 11 - specialval RESULT, 286 + specialval RESULT, sub_810F424 pokecasino RESULT releaseall end diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 9abac00d7..bd5c119f3 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -47,24 +47,24 @@ MauvilleCity_Gym_EventScript_15649B:: @ 815649B MauvilleCity_Gym_EventScript_15657D:: @ 815657D setvar 0x8004, 0 - special 140 + special MauvilleGymSpecial1 jump MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_15658B:: @ 815658B setvar 0x8004, 1 - special 140 + special MauvilleGymSpecial1 jump MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_156599:: @ 8156599 setvar 0x8004, 2 - special 140 + special MauvilleGymSpecial1 jump MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 - special 144 + special MauvilleGymSpecial3 end MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB @@ -89,8 +89,8 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB callif 1, MauvilleCity_Gym_EventScript_1A00FB setvar 0x8008, 3 call MauvilleCity_Gym_EventScript_1A01C0 - special 144 - special 142 + special MauvilleGymSpecial3 + special DrawWholeMapView playsfx 44 jump MauvilleCity_Gym_EventScript_15661D end @@ -143,9 +143,9 @@ MauvilleCity_Gym_EventScript_156695:: @ 8156695 end MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA - special 139 - special 140 - special 142 + special MauvilleGymSpecial2 + special MauvilleGymSpecial1 + special DrawWholeMapView playsfx 44 checkflag 99 jumpeq MauvilleCity_Gym_EventScript_1566E1 diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc index b943b9c8f..b2b5dabd4 100644 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc @@ -9,7 +9,7 @@ MauvilleCity_PokemonCenter_1F_MapScript1_157357:: @ 8157357 end MauvilleCity_PokemonCenter_1F_EventScript_157365:: @ 8157365 - special 104 + special sub_80F83D0 end MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369 diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc index 6c239043d..8e45c34ae 100644 --- a/data/scripts/maps/MeteorFalls_1F_2R.inc +++ b/data/scripts/maps/MeteorFalls_1F_2R.inc @@ -3,7 +3,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 815C678 MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 trainerbattle 0, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq MeteorFalls_1F_2R_EventScript_15C6A0 msgbox MeteorFalls_1F_2R_Text_193A60, 6 @@ -16,7 +16,7 @@ MeteorFalls_1F_2R_EventScript_15C6A0:: @ 815C6A0 MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq MeteorFalls_1F_2R_EventScript_15C6E2 msgbox MeteorFalls_1F_2R_Text_193C35, 6 @@ -29,7 +29,7 @@ MeteorFalls_1F_2R_EventScript_15C6E2:: @ 815C6E2 MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq MeteorFalls_1F_2R_EventScript_15C728 msgbox MeteorFalls_1F_2R_Text_193D9A, 6 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index c56adb1f3..14836f3e0 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -5,7 +5,7 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52 .byte 0 MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 - special 246 + special sub_813601C compare RESULT, 1 callif 1, MossdeepCity_GameCorner_1F_EventScript_15AC71 end @@ -16,7 +16,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 return MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 - special 246 + special sub_813601C compare RESULT, 0 callif 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E compare 0x40c0, 0 @@ -55,7 +55,7 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 callif 1, MossdeepCity_GameCorner_1F_EventScript_15AD2B compare 0x40c0, 3 callif 1, MossdeepCity_GameCorner_1F_EventScript_15AD34 - special 40 + special LoadPlayerParty setvar 0x40c0, 0 releaseall end @@ -91,8 +91,8 @@ MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 end MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 - special 39 - special 285 + special SavePlayerParty + special sub_810F414 msgbox MossdeepCity_GameCorner_1F_Text_18E650, 5 compare RESULT, 0 jumpeq MossdeepCity_GameCorner_1F_EventScript_15ADE8 @@ -102,13 +102,13 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 msgbox MossdeepCity_GameCorner_1F_Text_18E741, 5 compare RESULT, 0 callif 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8 - special 40 + special LoadPlayerParty call MossdeepCity_GameCorner_1F_EventScript_19F806 compare RESULT, 0 jumpeq MossdeepCity_GameCorner_1F_EventScript_15ADE8 hidebox 0, 0, 15, 10 - special 39 - special 248 + special SavePlayerParty + special ReducePlayerPartyToThree msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4 closebutton compare FACING, 2 @@ -123,7 +123,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 end MossdeepCity_GameCorner_1F_EventScript_15ADE8:: @ 815ADE8 - special 40 + special LoadPlayerParty msgbox MossdeepCity_GameCorner_1F_Text_18E698, 4 release end @@ -131,7 +131,7 @@ MossdeepCity_GameCorner_1F_EventScript_15ADE8:: @ 815ADE8 MossdeepCity_GameCorner_1F_EventScript_15ADF5:: @ 815ADF5 msgbox MossdeepCity_GameCorner_1F_Text_18E6DA, 4 fadescreen 1 - special 41 + special sub_80C5568 waitstate return diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index a733093f9..a5a013d5f 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -4,7 +4,7 @@ MossdeepCity_GameCorner_B1F_MapScripts:: @ 815AE55 .byte 0 MossdeepCity_GameCorner_B1F_MapScript1_15AE60:: @ 815AE60 - special 322 + special sub_8134AB4 end MossdeepCity_GameCorner_B1F_MapScript2_15AE64:: @ 815AE64 @@ -15,12 +15,12 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E lockall move 255, MossdeepCity_GameCorner_B1F_Movement_15AEF9 waitmove 0 - special 235 + special sub_81360C0 msgbox 0x20234cc, 4 closebutton setvar 0x8004, 2 setvar 0x8005, 0 - special 236 + special sub_813556C waitstate compare RESULT, 3 callif 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5 @@ -29,10 +29,10 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E compare RESULT, 2 callif 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE closebutton - special 0 + special HealPlayerParty move 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF waitmove 0 - special 40 + special LoadPlayerParty setvar 0x4001, 1 warp MossdeepCity_GameCorner_1F, 255, 3, 1 waitstate @@ -46,14 +46,14 @@ MossdeepCity_GameCorner_B1F_EventScript_15AED5:: @ 815AED5 MossdeepCity_GameCorner_B1F_EventScript_15AEE3:: @ 815AEE3 setvar 0x40c0, 1 - special 141 + special ShowFieldMessageStringVar4 waittext waitbutton return MossdeepCity_GameCorner_B1F_EventScript_15AEEE:: @ 815AEEE setvar 0x40c0, 2 - special 141 + special ShowFieldMessageStringVar4 waittext waitbutton return diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 192f9e396..20f43a150 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -93,7 +93,7 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA end MossdeepCity_Gym_EventScript_15A619:: @ 815A619 - special 142 + special DrawWholeMapView playsfx 36 releaseall end diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index d83e49643..319dfba8e 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -6,7 +6,7 @@ MossdeepCity_House1_EventScript_15A82F:: @ 815A82F faceplayer bufferfirstpoke 0 msgbox MossdeepCity_House1_Text_18D465, 4 - specialval RESULT, 277 + specialval RESULT, GetPokeblockNameByMonNature compare RESULT, 0 jumpeq MossdeepCity_House1_EventScript_15A855 msgbox MossdeepCity_House1_Text_18D475, 4 diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index bc8f44400..12dc941e7 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -18,10 +18,10 @@ MossdeepCity_House4_EventScript_15AB46:: @ 815AB46 MossdeepCity_House4_EventScript_15AB50:: @ 815AB50 lock faceplayer - special 7 + special sub_80BB63C compare RESULT, 0 jumpeq MossdeepCity_House4_EventScript_15AB6D - special 278 + special GetSecretBaseNearbyMapName msgbox MossdeepCity_House4_Text_18E17E, 4 release end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 3b3a7f083..db31e4c62 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -5,7 +5,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B lock faceplayer checkdailyflags - specialval RESULT, 256 + specialval RESULT, GetWeekCount buffernum 0, RESULT compare RESULT, 0 callif 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index b7a43328b..fdebcf102 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -440,7 +440,7 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA MtChimney_EventScript_15D1E3:: @ 815D1E3 trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq MtChimney_EventScript_15D20A msgbox MtChimney_Text_195A04, 6 diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index c00914f2e..24101b0cb 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -47,8 +47,8 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C setvar 0x8004, 1 setvar 0x40a3, 2 inccounter GAME_STAT_RODE_CABLE_CAR - special 151 - special 152 + special CableCarWarp + special sub_8123218 waitstate release end diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc index 3729079bb..657b4ef15 100644 --- a/data/scripts/maps/MtPyre_6F.inc +++ b/data/scripts/maps/MtPyre_6F.inc @@ -3,7 +3,7 @@ MtPyre_6F_MapScripts:: @ 815D447 MtPyre_6F_EventScript_15D448:: @ 815D448 trainerbattle 0, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq MtPyre_6F_EventScript_15D46F msgbox MtPyre_6F_Text_196A4C, 6 diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index dc5885939..547fc72e7 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -39,7 +39,7 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC setmaptile 3, 1, 715, 1 setmaptile 4, 1, 716, 0 setmaptile 5, 1, 717, 1 - special 142 + special DrawWholeMapView playsfx 20 setvar 0x40ba, 1 releaseall diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 29c42e460..b088b8e7d 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -33,7 +33,7 @@ NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA setvar 0x4002, 0 playsfx 21 call NewMauville_Inside_EventScript_15E5DA - special 142 + special DrawWholeMapView releaseall end @@ -43,7 +43,7 @@ NewMauville_Inside_EventScript_15E5C2:: @ 815E5C2 setvar 0x4002, 1 playsfx 21 call NewMauville_Inside_EventScript_15E728 - special 142 + special DrawWholeMapView releaseall end @@ -145,7 +145,7 @@ NewMauville_Inside_EventScript_15E88B:: @ 815E88B setmaptile 33, 3, 757, 1 setmaptile 34, 3, 758, 1 setmaptile 35, 3, 759, 1 - special 142 + special DrawWholeMapView return NewMauville_Inside_EventScript_15E8E0:: @ 815E8E0 diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index b95a41ceb..e45f09de4 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -13,10 +13,10 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 checkflag 300 callif 0, PacifidlogTown_House2_EventScript_1541D7 setflag 300 - specialval RESULT, 230 + specialval RESULT, GetLeadMonFriendshipScore compare RESULT, 4 jumpif 4, PacifidlogTown_House2_EventScript_1541EC - specialval RESULT, 230 + specialval RESULT, GetLeadMonFriendshipScore compare RESULT, 2 jumpif 4, PacifidlogTown_House2_EventScript_15421B jump PacifidlogTown_House2_EventScript_154225 @@ -25,7 +25,7 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 checkflag 299 jumpif 0, PacifidlogTown_House2_EventScript_1A14DC - specialval RESULT, 334 + specialval RESULT, sub_810F908 compare RESULT, 0 callif 1, PacifidlogTown_House2_EventScript_1541E8 return @@ -49,7 +49,7 @@ PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC compare RESULT, 0 jumpeq PacifidlogTown_House2_EventScript_1A029B setflag 299 - special 333 + special sub_810F950 msgbox PacifidlogTown_House2_Text_179283, 4 release end @@ -65,13 +65,13 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 compare RESULT, 0 jumpeq PacifidlogTown_House2_EventScript_1A029B setflag 299 - special 333 + special sub_810F950 msgbox PacifidlogTown_House2_Text_179283, 4 release end PacifidlogTown_House2_EventScript_154254:: @ 8154254 - specialval RESULT, 334 + specialval RESULT, sub_810F908 buffernum 0, RESULT msgbox PacifidlogTown_House2_Text_1792F2, 4 release diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 7ee815f07..6ab9a09b0 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -8,25 +8,25 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E jumpeq PacifidlogTown_House3_EventScript_154338 setvar 0x8008, 2 copyvar 0x8004, 0x8008 - specialval RESULT, 252 + specialval RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 compare RESULT, 0 jumpeq PacifidlogTown_House3_EventScript_154320 - special 159 + special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 compare 0x8004, 255 jumpeq PacifidlogTown_House3_EventScript_154320 copyvar 0x8005, 0x800a - specialval RESULT, 255 + specialval RESULT, sub_804DB2C copyvar 0x800b, RESULT comparevars RESULT, 0x8009 jumpif 5, PacifidlogTown_House3_EventScript_15432A copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a - special 253 - special 254 + special sub_804DB68 + special sub_804E174 waitstate bufferpoke 0, 0x8009 msgbox PacifidlogTown_House3_Text_1794C4, 4 diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/scripts/maps/PacifidlogTown_House5.inc index f20de28df..dca1a51b0 100644 --- a/data/scripts/maps/PacifidlogTown_House5.inc +++ b/data/scripts/maps/PacifidlogTown_House5.inc @@ -4,7 +4,7 @@ PacifidlogTown_House5_MapScripts:: @ 8154393 PacifidlogTown_House5_EventScript_154394:: @ 8154394 lock faceplayer - specialval RESULT, 209 + specialval RESULT, IsMirageIslandPresent compare RESULT, 1 jumpeq PacifidlogTown_House5_EventScript_1543B0 msgbox PacifidlogTown_House5_Text_179718, 4 diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 3667eb3cf..dc5efe243 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -26,13 +26,13 @@ PetalburgCity_MapScript2_14B73D:: @ 814B73D PetalburgCity_EventScript_14B747:: @ 814B747 lockall setflag 0x4000 - special 39 - special 301 + special SavePlayerParty + special PutZigzagoonInPlayerParty move 2, PetalburgCity_Movement_14B7ED move 255, PetalburgCity_Movement_14B7CC waitmove 0 msgbox PetalburgCity_Text_16D361, 4 - special 157 + special StartBattle_WallyTutorial waitstate msgbox PetalburgCity_Text_16D3DE, 4 movecoords 2, PetalburgCity_Movement_1A083F, 0, 0 @@ -43,7 +43,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747 setvar 0x4057, 3 fadedefault clearflag 0x4001 - special 40 + special LoadPlayerParty setvar 0x4085, 1 warp PetalburgCity_Gym, 255, 4, 108 waitstate diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 9c6802e28..c534cb538 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -211,7 +211,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 clearflag 726 clearflag 866 setflag 889 - special 211 + special InitBirchState warp PetalburgCity, 255, 15, 8 waitstate release @@ -363,7 +363,7 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D end PetalburgCity_Gym_EventScript_154969:: @ 8154969 - specialval RESULT, 50 + specialval RESULT, IsEnigmaBerryValid compare RESULT, 0 jumpeq PetalburgCity_Gym_EventScript_1549B2 checkitem ITEM_ENIGMA_BERRY, 1 @@ -407,7 +407,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 call PetalburgCity_Gym_EventScript_1A01C0 clearflag 940 call PetalburgCity_Gym_EventScript_1544ED - special 142 + special DrawWholeMapView jump PetalburgCity_Gym_EventScript_154A2C end @@ -773,7 +773,7 @@ PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 PetalburgCity_Gym_EventScript_154E1A:: @ 8154E1A setvar 0x8005, 0 call PetalburgCity_Gym_EventScript_154FBB - special 142 + special DrawWholeMapView release end @@ -791,7 +791,7 @@ PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 PetalburgCity_Gym_EventScript_154E56:: @ 8154E56 setvar 0x8005, 0 call PetalburgCity_Gym_EventScript_154FFD - special 142 + special DrawWholeMapView release end @@ -809,7 +809,7 @@ PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E PetalburgCity_Gym_EventScript_154E92:: @ 8154E92 setvar 0x8005, 0 call PetalburgCity_Gym_EventScript_15503F - special 142 + special DrawWholeMapView release end @@ -827,7 +827,7 @@ PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA PetalburgCity_Gym_EventScript_154ECE:: @ 8154ECE setvar 0x8005, 0 call PetalburgCity_Gym_EventScript_155081 - special 142 + special DrawWholeMapView release end @@ -845,7 +845,7 @@ PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 PetalburgCity_Gym_EventScript_154F0A:: @ 8154F0A setvar 0x8005, 0 call PetalburgCity_Gym_EventScript_154FDC - special 142 + special DrawWholeMapView release end @@ -863,7 +863,7 @@ PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 PetalburgCity_Gym_EventScript_154F46:: @ 8154F46 setvar 0x8005, 0 call PetalburgCity_Gym_EventScript_15501E - special 142 + special DrawWholeMapView release end @@ -881,7 +881,7 @@ PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E PetalburgCity_Gym_EventScript_154F82:: @ 8154F82 setvar 0x8005, 0 call PetalburgCity_Gym_EventScript_155060 - special 142 + special DrawWholeMapView release end @@ -1010,12 +1010,12 @@ PetalburgCity_Gym_EventScript_15516F:: @ 815516F return PetalburgCity_Gym_EventScript_155182:: @ 8155182 - special 145 + special PetalburgGymSpecial1 waitstate return PetalburgCity_Gym_EventScript_155187:: @ 8155187 - special 146 + special PetalburgGymSpecial2 return PetalburgCity_Gym_EventScript_15518B:: @ 815518B diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 09d414dcb..5ef99eee1 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -27,7 +27,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233 lock faceplayer msgbox PetalburgCity_PokemonCenter_1F_Text_17BDC5, 4 - specialval RESULT, 302 + specialval RESULT, IsStarterInParty compare RESULT, 1 jumpeq PetalburgCity_PokemonCenter_1F_EventScript_15524F release diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 8d6946bcd..c24f7c195 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -271,7 +271,7 @@ PetalburgWoods_EventScript_15CF27:: @ 815CF27 PetalburgWoods_EventScript_15CF3E:: @ 815CF3E trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq PetalburgWoods_EventScript_15CF65 msgbox PetalburgWoods_Text_1952CC, 6 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 944473e96..8462603a6 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -224,12 +224,12 @@ Route101_EventScript_14EA7F:: @ 814EA7F movesprite 255, 6, 13 move 255, Route101_Movement_1A083F waitmove 0 - special 156 + special ChooseStarter waitstate move 2, Route101_Movement_14EAD7 waitmove 0 msgbox Route101_Text_16D191, 4 - special 0 + special HealPlayerParty setflag 720 clearflag 721 setflag 700 diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index 70d25eace..b0a714763 100644 --- a/data/scripts/maps/Route102.inc +++ b/data/scripts/maps/Route102.inc @@ -19,7 +19,7 @@ Route102_EventScript_14EAF5:: @ 814EAF5 Route102_EventScript_14EAFE:: @ 814EAFE trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route102_EventScript_14EB25 msgbox Route102_Text_1B7A60, 6 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index f47f5a824..4c7da3d0d 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -173,7 +173,7 @@ Route103_EventScript_14ED94:: @ 814ED94 Route103_EventScript_14EDAB:: @ 814EDAB trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route103_EventScript_14EDD6 msgbox Route103_Text_1B7E50, 6 @@ -186,7 +186,7 @@ Route103_EventScript_14EDD6:: @ 814EDD6 Route103_EventScript_14EDF1:: @ 814EDF1 trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route103_EventScript_14EE1C msgbox Route103_Text_1B7F40, 6 @@ -204,7 +204,7 @@ Route103_EventScript_14EE37:: @ 814EE37 Route103_EventScript_14EE4E:: @ 814EE4E trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route103_EventScript_14EE75 msgbox Route103_Text_1B830D, 6 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index bb98b023d..b617767bf 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -409,7 +409,7 @@ Route104_EventScript_14F189:: @ 814F189 Route104_EventScript_14F1A0:: @ 814F1A0 trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route104_EventScript_14F1C7 msgbox Route104_Text_1B87C3, 6 @@ -422,7 +422,7 @@ Route104_EventScript_14F1C7:: @ 814F1C7 Route104_EventScript_14F1DE:: @ 814F1DE trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route104_EventScript_14F205 msgbox Route104_Text_1B8925, 6 @@ -435,7 +435,7 @@ Route104_EventScript_14F205:: @ 814F205 Route104_EventScript_14F21C:: @ 814F21C trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 @@ -448,14 +448,14 @@ Route104_EventScript_14F243:: @ 814F243 Route104_EventScript_14F25A:: @ 814F25A trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B83E9, Route104_Text_1B8414, Route104_Text_1B845C - special 148 + special GetPlayerBigGuyGirlString msgbox Route104_Text_1B842C, 4 release end Route104_EventScript_14F279:: @ 814F279 trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B84DB, Route104_Text_1B850D, Route104_Text_1B8577 - special 148 + special GetPlayerBigGuyGirlString msgbox Route104_Text_1B853B, 4 release end diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc index 184127187..ff1c9d258 100644 --- a/data/scripts/maps/Route104_Prototype.inc +++ b/data/scripts/maps/Route104_Prototype.inc @@ -60,7 +60,7 @@ Route104_Prototype_EventScript_160CFB:: @ 8160CFB pause 60 fadescreen 1 pause 60 - special 271 + special DoSoftReset waitstate release end diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc index 1889eb4d7..0c25594c6 100644 --- a/data/scripts/maps/Route106.inc +++ b/data/scripts/maps/Route106.inc @@ -17,7 +17,7 @@ Route106_EventScript_14F34F:: @ 814F34F Route106_EventScript_14F366:: @ 814F366 trainerbattle 0, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route106_EventScript_14F38D msgbox Route106_Text_1B8F55, 6 diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc index ef3407265..a14bb7298 100644 --- a/data/scripts/maps/Route107.inc +++ b/data/scripts/maps/Route107.inc @@ -8,7 +8,7 @@ Route107_EventScript_14F3BC:: @ 814F3BC Route107_EventScript_14F3D3:: @ 814F3D3 trainerbattle 0, OPPONENT_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route107_EventScript_14F3FA msgbox Route107_Text_1B938E, 6 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 343a8cab9..58c38173e 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -327,7 +327,7 @@ Route109_EventScript_14F70E:: @ 814F70E Route109_EventScript_14F725:: @ 814F725 lock faceplayer - special 148 + special GetPlayerBigGuyGirlString checkflag 280 jumpeq Route109_EventScript_14F762 msgbox Route109_Text_16E433, 4 @@ -396,7 +396,7 @@ Route109_EventScript_14F7F2:: @ 814F7F2 Route109_EventScript_14F809:: @ 814F809 trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route109_EventScript_14F830 msgbox Route109_Text_1B9C6E, 6 @@ -409,7 +409,7 @@ Route109_EventScript_14F830:: @ 814F830 Route109_EventScript_14F847:: @ 814F847 trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route109_EventScript_14F86E msgbox Route109_Text_1B9D8E, 6 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 55c8f67df..d8c19d92c 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -5,7 +5,7 @@ Route110_MapScripts:: @ 814F900 .byte 0 Route110_MapScript1_14F910:: @ 814F910 - special 229 + special UpdateCyclingRoadState end Route110_MapScript1_14F914:: @ 814F914 @@ -25,7 +25,7 @@ Route110_MapScript2_14F933:: @ 814F933 .2byte 0 Route110_EventScript_14F93D:: @ 814F93D - special 226 + special BeginCyclingRoadChallenge setvar 0x40a9, 2 return @@ -131,7 +131,7 @@ Route110_EventScript_14FA25:: @ 814FA25 Route110_EventScript_14FA2E:: @ 814FA2E lockall - specialval RESULT, 225 + specialval RESULT, GetRecordedCyclingRoadResults compare RESULT, 0 jumpeq Route110_EventScript_14FA49 msgbox Route110_Text_16F53A, 4 @@ -146,7 +146,7 @@ Route110_EventScript_14FA49:: @ 814FA49 Route110_EventScript_14FA53:: @ 814FA53 lock faceplayer - specialval RESULT, 227 + specialval RESULT, GetPlayerAvatarBike compare RESULT, 1 jumpeq Route110_EventScript_14FA84 compare 0x40a9, 0 @@ -177,7 +177,7 @@ Route110_EventScript_14FAA5:: @ 814FAA5 Route110_EventScript_14FABC:: @ 814FABC trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route110_EventScript_14FAE3 msgbox Route110_Text_1BA829, 6 @@ -205,7 +205,7 @@ Route110_EventScript_14FB28:: @ 814FB28 Route110_EventScript_14FB3F:: @ 814FB3F trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route110_EventScript_14FB66 msgbox Route110_Text_1BA3A5, 6 @@ -223,7 +223,7 @@ Route110_EventScript_14FB7D:: @ 814FB7D Route110_EventScript_14FB94:: @ 814FB94 trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route110_EventScript_14FBBB msgbox Route110_Text_1BA52E, 6 @@ -236,7 +236,7 @@ Route110_EventScript_14FBBB:: @ 814FBBB Route110_EventScript_14FBD2:: @ 814FBD2 trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route110_EventScript_14FBF9 msgbox Route110_Text_1BA9E9, 6 @@ -261,7 +261,7 @@ Route110_EventScript_14FC27:: @ 814FC27 end Route110_EventScript_14FC39:: @ 814FC39 - special 228 + special FinishCyclingRoadChallenge msgbox Route110_Text_16EF65, 4 switch RESULT case 10, Route110_EventScript_14FCC3 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index 0dbd5dfc4..96e492b39 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -23,7 +23,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB:: @ 81634EB Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 @ Coord event directly in front of the gatesman heading left to right lockall - specialval RESULT, 227 @ player state? + specialval RESULT, GetPlayerAvatarBike @ player state? compare RESULT, 2 callif 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D compare RESULT, 0 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 96fb13f2b..08d6fb5f1 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -10,7 +10,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F:: @ 816347F Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B lockall - specialval RESULT, 227 + specialval RESULT, GetPlayerAvatarBike compare RESULT, 0 jumpeq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 setflag 2091 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index d2b2eaefb..10e1a6865 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -13,7 +13,7 @@ Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B Route110_TrickHouseEnd_MapScript1_161957:: @ 8161957 setvar 0x4001, 0 setvar 0x4002, 0 - special 261 + special SetTrickHouseEndRoomFlag end Route110_TrickHouseEnd_MapScript2_161965:: @ 8161965 @@ -33,7 +33,7 @@ Route110_TrickHouseEnd_MapScript2_16197C:: @ 816197C Route110_TrickHouseEnd_EventScript_161986:: @ 8161986 setvar 0x4001, 1 call Route110_TrickHouseEnd_EventScript_161994 - special 142 + special DrawWholeMapView end Route110_TrickHouseEnd_EventScript_161994:: @ 8161994 @@ -175,7 +175,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF callif 1, Route110_TrickHouseEnd_EventScript_161C61 msgbox Route110_TrickHouseEnd_Text_19C85C, 4 call Route110_TrickHouseEnd_EventScript_161C2E - special 260 + special ResetTrickHouseEndRoomFlag release end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 434794b2f..2601942be 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -502,7 +502,7 @@ Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD setmaptile 5, 1, 537, 0 - special 142 + special DrawWholeMapView pause 20 move 255, Route110_TrickHouseEntrance_Movement_1A0856 waitmove 0 @@ -608,7 +608,7 @@ Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 playsfx SE_PIN setvar 0x40AB, 2 setmaptile 13, 1, 523, 0 - special 142 + special DrawWholeMapView releaseall end @@ -619,7 +619,7 @@ Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 playsfx SE_PIN setvar 0x40AC, 2 setmaptile 13, 1, 523, 0 - special 142 + special DrawWholeMapView releaseall end @@ -630,7 +630,7 @@ Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 playsfx SE_PIN setvar 0x40AD, 2 setmaptile 13, 1, 523, 0 - special 142 + special DrawWholeMapView releaseall end @@ -641,7 +641,7 @@ Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB playsfx SE_PIN setvar 0x40AE, 2 setmaptile 13, 1, 523, 0 - special 142 + special DrawWholeMapView releaseall end @@ -652,7 +652,7 @@ Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 playsfx SE_PIN setvar 0x40AF, 2 setmaptile 13, 1, 523, 0 - special 142 + special DrawWholeMapView releaseall end @@ -663,7 +663,7 @@ Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D playsfx SE_PIN setvar 0x40B0, 2 setmaptile 13, 1, 523, 0 - special 142 + special DrawWholeMapView releaseall end @@ -674,7 +674,7 @@ Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 playsfx SE_PIN setvar 0x40B1, 2 setmaptile 13, 1, 523, 0 - special 142 + special DrawWholeMapView releaseall end @@ -685,7 +685,7 @@ Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F playsfx SE_PIN setvar 0x40B2, 2 setmaptile 13, 1, 523, 0 - special 142 + special DrawWholeMapView releaseall end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index 183431bfc..27ffad50d 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -38,7 +38,7 @@ Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 setvar 0x4001, 1 playsfx 21 call Route110_TrickHousePuzzle2_EventScript_161E2C - special 142 + special DrawWholeMapView releaseall end @@ -47,7 +47,7 @@ Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 setvar 0x4002, 1 playsfx 21 call Route110_TrickHousePuzzle2_EventScript_161E3F - special 142 + special DrawWholeMapView releaseall end @@ -56,7 +56,7 @@ Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 setvar 0x4003, 1 playsfx 21 call Route110_TrickHousePuzzle2_EventScript_161E52 - special 142 + special DrawWholeMapView releaseall end @@ -65,7 +65,7 @@ Route110_TrickHousePuzzle2_EventScript_161E19:: @ 8161E19 setvar 0x4004, 1 playsfx 21 call Route110_TrickHousePuzzle2_EventScript_161E65 - special 142 + special DrawWholeMapView releaseall end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index b533dbbe5..efd96ec44 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -351,7 +351,7 @@ Route110_TrickHousePuzzle3_EventScript_1626AD:: @ 81626AD callif 1, Route110_TrickHousePuzzle3_EventScript_161FE5 compare 0x4009, 0 callif 1, Route110_TrickHousePuzzle3_EventScript_1622C8 - special 142 + special DrawWholeMapView compare 0x4009, 1 jumpeq Route110_TrickHousePuzzle3_EventScript_1626DD compare 0x4009, 0 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index 56d350871..1e47bbd83 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -4,7 +4,7 @@ Route110_TrickHousePuzzle6_MapScripts:: @ 81630CD .byte 0 Route110_TrickHousePuzzle6_MapScript1_1630D8:: @ 81630D8 - special 201 + special RotatingGate_InitPuzzle end Route110_TrickHousePuzzle6_MapScript2_1630DC:: @ 81630DC @@ -12,7 +12,7 @@ Route110_TrickHousePuzzle6_MapScript2_1630DC:: @ 81630DC .2byte 0 Route110_TrickHousePuzzle6_EventScript_1630E6:: @ 81630E6 - special 202 + special RotatingGate_InitPuzzleAndGraphics end Route110_TrickHousePuzzle6_EventScript_1630EA:: @ 81630EA diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 1276562d0..7f965b467 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -125,7 +125,7 @@ Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 callif 0, Route110_TrickHousePuzzle7_EventScript_163195 checkflag 194 callif 1, Route110_TrickHousePuzzle7_EventScript_1631F4 - special 142 + special DrawWholeMapView playsfx 36 checkflag 194 jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633A4 @@ -140,7 +140,7 @@ Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 callif 0, Route110_TrickHousePuzzle7_EventScript_1631A8 checkflag 195 callif 1, Route110_TrickHousePuzzle7_EventScript_163207 - special 142 + special DrawWholeMapView playsfx 36 checkflag 195 jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633AE @@ -155,7 +155,7 @@ Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 callif 0, Route110_TrickHousePuzzle7_EventScript_1631BB checkflag 196 callif 1, Route110_TrickHousePuzzle7_EventScript_16321A - special 142 + special DrawWholeMapView playsfx 36 checkflag 196 jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633B8 @@ -170,7 +170,7 @@ Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 callif 0, Route110_TrickHousePuzzle7_EventScript_1631CE checkflag 197 callif 1, Route110_TrickHousePuzzle7_EventScript_16322D - special 142 + special DrawWholeMapView playsfx 36 checkflag 197 jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633C2 @@ -185,7 +185,7 @@ Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 callif 0, Route110_TrickHousePuzzle7_EventScript_1631E1 checkflag 198 callif 1, Route110_TrickHousePuzzle7_EventScript_163240 - special 142 + special DrawWholeMapView playsfx 36 checkflag 198 jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633CC diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 10b34cf5f..1358a44be 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -128,7 +128,7 @@ Route111_EventScript_1500C5:: @ 81500C5 compare RESULT, 0 jumpeq Route111_EventScript_1A029B setflag 2252 - special 148 + special GetPlayerBigGuyGirlString msgbox Route111_Text_1C5781, 4 release end @@ -392,7 +392,7 @@ Route111_EventScript_1503EC:: @ 81503EC Route111_EventScript_150403:: @ 8150403 trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route111_EventScript_15042A msgbox Route111_Text_1BAF5B, 6 @@ -420,7 +420,7 @@ Route111_EventScript_15046F:: @ 815046F Route111_EventScript_150486:: @ 8150486 trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route111_EventScript_1504AD msgbox Route111_Text_1BB33E, 6 @@ -433,7 +433,7 @@ Route111_EventScript_1504AD:: @ 81504AD Route111_EventScript_1504C4:: @ 81504C4 trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route111_EventScript_1504EB msgbox Route111_Text_1BB4CE, 6 diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index c2ad14a02..1c1e36838 100644 --- a/data/scripts/maps/Route112.inc +++ b/data/scripts/maps/Route112.inc @@ -38,7 +38,7 @@ Route112_EventScript_150549:: @ 8150549 Route112_EventScript_150560:: @ 8150560 trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route112_EventScript_150587 msgbox Route112_Text_1BB721, 6 diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 3e5f75929..016b868a8 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -48,8 +48,8 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD setvar 0x8004, 0 setvar 0x40a3, 1 inccounter GAME_STAT_RODE_CABLE_CAR - special 151 - special 152 + special CableCarWarp + special sub_8123218 waitstate release end diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index c07f537d1..1fc5a9345 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -60,7 +60,7 @@ Route113_EventScript_150652:: @ 8150652 Route113_EventScript_150669:: @ 8150669 trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route113_EventScript_150690 msgbox Route113_Text_1BBB9A, 6 @@ -73,7 +73,7 @@ Route113_EventScript_150690:: @ 8150690 Route113_EventScript_1506A7:: @ 81506A7 trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route113_EventScript_1506CE msgbox Route113_Text_1BBCAB, 6 diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index d59942472..83983f9bb 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -52,7 +52,7 @@ Route113_GlassWorkshop_EventScript_1635E4:: @ 81635E4 Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE setvar 0x8009, 0 - special 274 + special ShowGlassWorkshopMenu waitstate switch RESULT case 0, Route113_GlassWorkshop_EventScript_163660 diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 33e89be70..cfe1dfe7d 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -87,7 +87,7 @@ Route114_EventScript_150836:: @ 8150836 Route114_EventScript_15084D:: @ 815084D trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 @@ -100,7 +100,7 @@ Route114_EventScript_150874:: @ 8150874 Route114_EventScript_15088B:: @ 815088B trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 6 diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc index e2c00f6fc..2b0d744ca 100644 --- a/data/scripts/maps/Route115.inc +++ b/data/scripts/maps/Route115.inc @@ -15,7 +15,7 @@ Route115_EventScript_150940:: @ 8150940 Route115_EventScript_150949:: @ 8150949 trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route115_EventScript_150970 msgbox Route115_Text_1BCA0E, 6 @@ -33,7 +33,7 @@ Route115_EventScript_150987:: @ 8150987 Route115_EventScript_15099E:: @ 815099E trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route115_EventScript_1509C5 msgbox Route115_Text_1BCBDE, 6 @@ -46,7 +46,7 @@ Route115_EventScript_1509C5:: @ 81509C5 Route115_EventScript_1509DC:: @ 81509DC trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route115_EventScript_150A03 msgbox Route115_Text_1BCD4C, 6 diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index c563dce46..f5ef82f8b 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -150,7 +150,7 @@ Route116_EventScript_150B8F:: @ 8150B8F checkitem ITEM_BLACK_GLASSES, 1 compare RESULT, 1 jumpeq Route116_EventScript_150BCA - specialval RESULT, 316 + specialval RESULT, sub_810F828 compare RESULT, 1 jumpeq Route116_EventScript_150BBB msgbox Route116_Text_1708EE, 4 @@ -166,7 +166,7 @@ Route116_EventScript_150BBB:: @ 8150BBB Route116_EventScript_150BCA:: @ 8150BCA msgbox Route116_Text_1708EE, 4 msgbox Route116_Text_170921, 4 - specialval RESULT, 316 + specialval RESULT, sub_810F828 compare RESULT, 1 jumpeq Route116_EventScript_150BF4 msgbox Route116_Text_170A03, 4 @@ -240,7 +240,7 @@ Route116_EventScript_150C79:: @ 8150C79 Route116_EventScript_150C90:: @ 8150C90 trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route116_EventScript_150CB7 msgbox Route116_Text_1BD248, 6 @@ -263,7 +263,7 @@ Route116_EventScript_150CE5:: @ 8150CE5 Route116_EventScript_150CFC:: @ 8150CFC trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route116_EventScript_150D23 msgbox Route116_Text_1BD3C3, 6 diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 8c738ffff..61dbf6a30 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -40,7 +40,7 @@ Route117_EventScript_150D84:: @ 8150D84 Route117_EventScript_150D8D:: @ 8150D8D trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route117_EventScript_150DB4 msgbox Route117_Text_1BD4F9, 6 @@ -53,7 +53,7 @@ Route117_EventScript_150DB4:: @ 8150DB4 Route117_EventScript_150DCB:: @ 8150DCB trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route117_EventScript_150DF2 msgbox Route117_Text_1BD69B, 6 @@ -66,7 +66,7 @@ Route117_EventScript_150DF2:: @ 8150DF2 Route117_EventScript_150E09:: @ 8150E09 trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route117_EventScript_150E30 msgbox Route117_Text_1BD7F5, 6 @@ -79,7 +79,7 @@ Route117_EventScript_150E30:: @ 8150E30 Route117_EventScript_150E47:: @ 8150E47 trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route117_EventScript_150E6E msgbox Route117_Text_1BD98F, 6 @@ -97,7 +97,7 @@ Route117_EventScript_150E85:: @ 8150E85 Route117_EventScript_150E9C:: @ 8150E9C trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route117_EventScript_150EC7 msgbox Route117_Text_1BDC44, 6 @@ -110,7 +110,7 @@ Route117_EventScript_150EC7:: @ 8150EC7 Route117_EventScript_150EE2:: @ 8150EE2 trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route117_EventScript_150F0D msgbox Route117_Text_1BDD4E, 6 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 4d739ce68..0b5b4748e 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -161,7 +161,7 @@ Route118_Movement_151086:: @ 8151086 Route118_EventScript_15108F:: @ 815108F trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route118_EventScript_1510B6 msgbox Route118_Text_1BE05E, 6 @@ -184,7 +184,7 @@ Route118_EventScript_1510E4:: @ 81510E4 Route118_EventScript_1510FB:: @ 81510FB trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route118_EventScript_151122 msgbox Route118_Text_1BE413, 6 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 1ccc972bb..55a3fb1dc 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -29,7 +29,7 @@ Route119_MapScript1_15119B:: @ 815119B call Route119_EventScript_1A0196 compare 0x40b3, 1 callif 1, Route119_EventScript_1511B9 - special 324 + special SetRoute119Weather end Route119_EventScript_1511B9:: @ 81511B9 @@ -296,7 +296,7 @@ Route119_EventScript_1514A8:: @ 81514A8 Route119_EventScript_1514BF:: @ 81514BF trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route119_EventScript_1514E6 msgbox Route119_Text_1BE937, 6 @@ -309,7 +309,7 @@ Route119_EventScript_1514E6:: @ 81514E6 Route119_EventScript_1514FD:: @ 81514FD trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route119_EventScript_151524 msgbox Route119_Text_1BEAB3, 6 diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index 36314a59f..95ec39d61 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -16,7 +16,7 @@ Route119_WeatherInstitute_1F_EventScript_163C41:: @ 8163C41 Route119_WeatherInstitute_1F_EventScript_163C4D:: @ 8163C4D lock faceplayer - special 148 + special GetPlayerBigGuyGirlString compare 0x40b3, 0 jumpeq Route119_WeatherInstitute_1F_EventScript_163C67 msgbox Route119_WeatherInstitute_1F_Text_19ED22, 4 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index ada773ffd..75385fe8f 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -120,7 +120,7 @@ Route120_EventScript_151739:: @ 8151739 callif 1, Route120_EventScript_151841 compare RESULT, 0 callif 1, Route120_EventScript_15184A - specialval RESULT, 147 + specialval RESULT, GetPlayerTrainerIdOnesDigit switch RESULT case 0, Route120_EventScript_1517DC case 5, Route120_EventScript_1517DC @@ -254,7 +254,7 @@ Route120_EventScript_151908:: @ 8151908 setmaptile 12, 16, 671, 0 setmaptile 12, 17, 161, 0 setmaptile 13, 17, 161, 0 - special 142 + special DrawWholeMapView release end @@ -292,7 +292,7 @@ Route120_EventScript_1519B3:: @ 81519B3 Route120_EventScript_1519CA:: @ 81519CA trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route120_EventScript_1519F1 msgbox Route120_Text_1BF0C3, 6 @@ -315,7 +315,7 @@ Route120_EventScript_151A1F:: @ 8151A1F Route120_EventScript_151A36:: @ 8151A36 trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route120_EventScript_151A5D msgbox Route120_Text_1BF38D, 6 diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 54912b0bc..e1aaec716 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -73,7 +73,7 @@ Route121_EventScript_151B72:: @ 8151B72 Route121_EventScript_151B89:: @ 8151B89 trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route121_EventScript_151BB0 msgbox Route121_Text_1BFA9D, 6 @@ -101,7 +101,7 @@ Route121_EventScript_151BF9:: @ 8151BF9 Route121_EventScript_151C14:: @ 8151C14 trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route121_EventScript_151C3B msgbox Route121_Text_1BFEAE, 6 diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 2056bc328..251b09c73 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -10,7 +10,7 @@ Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333 lockall move 255, Route121_SafariZoneEntrance_Movement_15C348 waitmove 0 - special 206 + special ExitSafariMode setvar 0x40a4, 0 releaseall end @@ -80,7 +80,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 hidemoney 0, 0 move 255, Route121_SafariZoneEntrance_Movement_15C47E waitmove 0 - special 205 + special EnterSafariMode setvar 0x40a4, 2 warp SafariZone_Southeast, 255, 32, 33 waitstate @@ -90,7 +90,7 @@ Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 countpokemon compare RESULT, 6 jumpif 5, Route121_SafariZoneEntrance_EventScript_15C44F - specialval RESULT, 304 + specialval RESULT, CheckFreePokemonStorageSpace compare RESULT, 1 jumpeq Route121_SafariZoneEntrance_EventScript_15C44F msgbox Route121_SafariZoneEntrance_Text_1C39A3, 4 diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index e9248c230..891a395f0 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -3,7 +3,7 @@ Route123_MapScripts:: @ 8151C53 .byte 0 Route123_MapScript1_151C59:: @ 8151C59 - special 325 + special SetRoute123Weather end Route123_EventScript_151C5D:: @ 8151C5D @@ -12,7 +12,7 @@ Route123_EventScript_151C5D:: @ 8151C5D checkflag 232 jumpeq Route123_EventScript_151CAC msgbox Route123_Text_171D83, 4 - special 299 + special IsGrassTypeInParty compare RESULT, 0 jumpeq Route123_EventScript_151CAA msgbox Route123_Text_171DC2, 4 @@ -62,7 +62,7 @@ Route123_EventScript_151CFF:: @ 8151CFF Route123_EventScript_151D16:: @ 8151D16 trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route123_EventScript_151D3D msgbox Route123_Text_1C01B1, 6 @@ -75,7 +75,7 @@ Route123_EventScript_151D3D:: @ 8151D3D Route123_EventScript_151D54:: @ 8151D54 trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route123_EventScript_151D7B msgbox Route123_Text_1C030F, 6 diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index ea288daa0..68f17b12a 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -23,7 +23,7 @@ Route124_EventScript_151E0F:: @ 8151E0F Route124_EventScript_151E26:: @ 8151E26 trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route124_EventScript_151E4D msgbox Route124_Text_1C080E, 6 @@ -46,7 +46,7 @@ Route124_EventScript_151E7B:: @ 8151E7B Route124_EventScript_151E92:: @ 8151E92 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route124_EventScript_151EBD msgbox Route124_Text_1C0B72, 6 @@ -59,7 +59,7 @@ Route124_EventScript_151EBD:: @ 8151EBD Route124_EventScript_151ED8:: @ 8151ED8 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route124_EventScript_151F03 msgbox Route124_Text_1C0C7F, 6 diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 0059fe6aa..a5d2457d5 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -29,7 +29,7 @@ Route125_EventScript_151F73:: @ 8151F73 Route125_EventScript_151F8A:: @ 8151F8A trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 28317c4e3..011591400 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -17,7 +17,7 @@ Route128_EventScript_15213F:: @ 815213F lockall pause 20 .ifndef SAPPHIRE - special 317 + special sub_807E25C waitstate .endif move 4, Route128_Movement_152271 @@ -182,7 +182,7 @@ Route128_Movement_1522A1:: @ 81522A1 Route128_EventScript_1522A4:: @ 81522A4 trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route128_EventScript_1522CB msgbox Route128_Text_1C1CC3, 6 @@ -195,7 +195,7 @@ Route128_EventScript_1522CB:: @ 81522CB Route128_EventScript_1522E2:: @ 81522E2 trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq Route128_EventScript_152309 msgbox Route128_Text_1C1E4A, 6 diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index 38818dba3..bac6728a7 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -3,7 +3,7 @@ Route130_MapScripts:: @ 81523C2 .byte 0 Route130_MapScript1_1523C8:: @ 81523C8 - specialval RESULT, 209 + specialval RESULT, IsMirageIslandPresent compare RESULT, 1 jumpeq Route130_EventScript_15240C setflag 17 diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index a10d7b69e..402fff1d3 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -8,25 +8,25 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D jumpeq RustboroCity_House1_EventScript_157D13 setvar 0x8008, 0 copyvar 0x8004, 0x8008 - specialval RESULT, 252 + specialval RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 compare RESULT, 0 jumpeq RustboroCity_House1_EventScript_157CFB - special 159 + special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 compare 0x8004, 255 jumpeq RustboroCity_House1_EventScript_157CFB copyvar 0x8005, 0x800a - specialval RESULT, 255 + specialval RESULT, sub_804DB2C copyvar 0x800b, RESULT comparevars RESULT, 0x8009 jumpif 5, RustboroCity_House1_EventScript_157D05 copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a - special 253 - special 254 + special sub_804DB68 + special sub_804E174 waitstate msgbox RustboroCity_House1_Text_184F6B, 4 setflag 153 diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index ff4857852..58cfbec47 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -10,7 +10,7 @@ SSTidalCorridor_MapScript2_15FC9A:: @ 815FC9A .2byte 0 SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC - special 203 + special SetSSTidalFlag setvar 0x40b4, 2 lockall playsfx 73 @@ -27,14 +27,14 @@ SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 end SSTidalRooms_EventScript_15FCE5:: @ 815FCE5 - special 203 + special SetSSTidalFlag setvar 0x40b4, 7 playsfx 73 msgbox SSTidalRooms_Text_199007, 4 return SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 - special 204 + special ResetSSTidalFlag setvar 0x40b4, 4 playsfx 73 msgbox SSTidalRooms_Text_1990F8, 4 @@ -48,7 +48,7 @@ gUnknown_0815FD0D:: @ 815FD0D end SSTidalCorridor_EventScript_15FD24:: @ 815FD24 - special 204 + special ResetSSTidalFlag setvar 0x40b4, 3 lockall playsfx 73 @@ -57,7 +57,7 @@ SSTidalCorridor_EventScript_15FD24:: @ 815FD24 end SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A - special 204 + special ResetSSTidalFlag setvar 0x40b4, 8 lockall playsfx 73 @@ -66,7 +66,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A end SSTidalRooms_EventScript_15FD50:: @ 815FD50 - special 204 + special ResetSSTidalFlag setvar 0x40b4, 8 playsfx 73 msgbox SSTidalRooms_Text_1990B4, 4 @@ -156,7 +156,7 @@ SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A end SSTidalCorridor_EventScript_15FE5B:: @ 815FE5B - special 270 + special sub_80C7958 waitstate end diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 196efbb35..22fd5ec56 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -93,7 +93,7 @@ SafariZone_Southeast_EventScript_16011F:: @ 816011F SafariZone_Southeast_EventScript_160139:: @ 8160139 setvar 0x40a4, 1 - special 206 + special ExitSafariMode warpwalk Route121_SafariZoneEntrance, 255, 2, 5 waitstate end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index ff8592f7d..71184346f 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -64,14 +64,14 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .endif setweather 0 doweather - special 332 + special sub_8081924 waitstate .ifdef SAPPHIRE msgbox UnknownString_81B43C4, 4 .else msgbox SeafloorCavern_Room9_Text_1B4A5A, 4 .endif - special 284 + special WaitWeather waitstate .ifdef SAPPHIRE setvar RESULT, 1 @@ -91,7 +91,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .endif fanfare 388 playsfx 107 - special 281 + special sub_80818A4 move 0x8004, SeafloorCavern_Room9_Movement_1A0841 move 255, SeafloorCavern_Room9_Movement_1A0841 waitmove 0 @@ -102,11 +102,11 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA pause 60 move 1, SeafloorCavern_Room9_Movement_15DD4C waitmove 0 - special 282 + special sub_80818FC waitstate setvar 0x8004, 1 setvar 0x8005, 1 - special 310 + special sub_810F758 waitstate move 1, SeafloorCavern_Room9_Movement_15DD57 waitmove 0 @@ -114,7 +114,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA pause 4 setvar 0x8004, 2 setvar 0x8005, 2 - special 310 + special sub_810F758 waitstate pause 30 setvar 0x8004, 2 diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 16d4c7003..76a930dc0 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -8,23 +8,23 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 hidebox 0, 0, 29, 19 checkflag 228 jumpeq SealedChamber_InnerRoom_EventScript_15F247 - specialval RESULT, 279 + specialval RESULT, CheckRelicanthWailord compare RESULT, 0 jumpeq SealedChamber_InnerRoom_EventScript_15F247 fadeout 0 playsfx 49 - special 305 + special DoSealedChamberShakingEffect1 waitstate pause 40 - special 315 + special DoSealedChamberShakingEffect2 waitstate playsfx 8 pause 40 - special 315 + special DoSealedChamberShakingEffect2 waitstate playsfx 8 pause 40 - special 315 + special DoSealedChamberShakingEffect2 waitstate playsfx 8 pause 40 diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/scripts/maps/SecretBase_YellowCave4.inc index 4ccbc2f0e..302bc3930 100644 --- a/data/scripts/maps/SecretBase_YellowCave4.inc +++ b/data/scripts/maps/SecretBase_YellowCave4.inc @@ -11,7 +11,7 @@ SecretBase_RedCave1_MapScript1_15F34C:: @ 815F34C SecretBase_RedCave1_MapScript1_15F34F:: @ 815F34F call SecretBase_RedCave1_EventScript_1A2F3D - special 22 + special sub_80BBFA4 end SecretBase_RedCave1_MapScript2_15F358:: @ 815F358 diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 9b822a473..38a1c9a74 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -3,7 +3,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057 .byte 0 ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D - special 210 + special UpdateShoalTideFlag checkflag 2106 jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E06E jump ShoalCave_LowTideEntranceRoom_EventScript_15E072 diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index eab522a1f..3078b4625 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -76,7 +76,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 compare RESULT, 0 jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 20, 859, 0 - special 142 + special DrawWholeMapView setflag 956 releaseall end @@ -94,7 +94,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 compare RESULT, 0 jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 10, 859, 0 - special 142 + special DrawWholeMapView setflag 957 releaseall end @@ -107,7 +107,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 compare RESULT, 0 jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 6, 9, 859, 0 - special 142 + special DrawWholeMapView setflag 958 releaseall end @@ -120,7 +120,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 compare RESULT, 0 jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 16, 13, 859, 0 - special 142 + special DrawWholeMapView setflag 959 releaseall end @@ -133,7 +133,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 compare RESULT, 0 jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 31, 8, 858, 0 - special 142 + special DrawWholeMapView setflag 952 releaseall end @@ -151,7 +151,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 compare RESULT, 0 jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 14, 26, 858, 0 - special 142 + special DrawWholeMapView setflag 953 releaseall end diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index dfcd5b83f..67de2676f 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -23,7 +23,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 compare RESULT, 0 jumpeq ShoalCave_LowTideLowerRoom_EventScript_1A029B setmaptile 18, 2, 858, 0 - special 142 + special DrawWholeMapView setflag 955 releaseall end diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc index 584a57818..c46a2cb2d 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc @@ -23,7 +23,7 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 compare RESULT, 0 jumpeq ShoalCave_LowTideStairsRoom_EventScript_1A029B setmaptile 11, 11, 858, 0 - special 142 + special DrawWholeMapView setflag 954 releaseall end diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index b28d89d93..23db6a8ea 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -21,7 +21,7 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 waitpokecry setflag 773 setflag 2145 - special 312 + special StartBattle_Rayquaza waitstate clearflag 2145 release diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 6125c4871..48eb5c1df 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -66,10 +66,10 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 faceplayer bufferfirstpoke 0 msgbox SlateportCity_Text_164682, 4 - specialval RESULT, 292 + specialval RESULT, LeadMonHasEffortRibbon compare RESULT, 1 callif 1, SlateportCity_EventScript_14BB35 - specialval RESULT, 294 + specialval RESULT, GetLeadMonEVCount compare RESULT, 0 callif 1, SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 @@ -78,7 +78,7 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 waitfanfare waittext msgbox SlateportCity_Text_1646FC, 4 - special 293 + special GivLeadMonEffortRibbon release end diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index b2cce5312..b1ce50815 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -11,7 +11,7 @@ SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D setvar CONTEST_RANK, 2 call SlateportCity_ContestLobby_EventScript_1A4E92 call SlateportCity_ContestLobby_EventScript_155448 - special 83 + special sub_80C4BF0 call SlateportCity_ContestLobby_EventScript_15FBDB setvar 0x4088, 3 warp LinkContestRoom1, 255, 7, 5 @@ -25,13 +25,13 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 playsfx 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 - special 142 + special DrawWholeMapView move 1, SlateportCity_ContestLobby_Movement_1554CF waitmove 0 playsfx 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 - special 142 + special DrawWholeMapView pause 20 move 1, SlateportCity_ContestLobby_Movement_1554DC waitmove 0 @@ -128,7 +128,7 @@ SlateportCity_ContestLobby_EventScript_155536:: @ 8155536 @ 815553F lockall - special 259 + special ShowBerryBlenderRecordWindow waitbutton hidebox 0, 0, 29, 19 releaseall diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index 702e52d84..4161889e1 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -13,7 +13,7 @@ SlateportCity_House1_EventScript_15567B:: @ 815567B SlateportCity_House1_EventScript_15569C:: @ 815569C msgbox SlateportCity_House1_Text_17D4DB, 4 - special 159 + special sub_80F9A0C waitstate compare 0x8004, 255 jumpif 5, SlateportCity_House1_EventScript_1556C9 @@ -27,15 +27,15 @@ SlateportCity_House1_EventScript_1556BF:: @ 81556BF end SlateportCity_House1_EventScript_1556C9:: @ 81556C9 - specialval RESULT, 327 + specialval RESULT, ScriptGetPartyMonSpecies compare RESULT, SPECIES_EGG jumpeq SlateportCity_House1_EventScript_15571C - special 124 - special 125 + special sub_80BFAE0 + special sub_80BFB10 compare RESULT, 1 jumpeq SlateportCity_House1_EventScript_155726 - specialval RESULT, 336 - special 124 + specialval RESULT, sub_810F96C + special sub_80BFAE0 compare RESULT, 1 jumpeq SlateportCity_House1_EventScript_155726 msgbox SlateportCity_House1_Text_17D505, 5 @@ -58,8 +58,8 @@ SlateportCity_House1_EventScript_155726:: @ 8155726 SlateportCity_House1_EventScript_155730:: @ 8155730 msgbox SlateportCity_House1_Text_17D580, 4 call SlateportCity_House1_EventScript_1A0678 - specialval RESULT, 123 - special 124 + specialval RESULT, sub_80BF9B4 + special sub_80BFAE0 compare RESULT, 1 jumpeq SlateportCity_House1_EventScript_15575A msgbox SlateportCity_House1_Text_17D63A, 4 diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 8f0323f77..0a7466a3b 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -144,7 +144,7 @@ SlateportCity_PokemonFanClub_EventScript_155998:: @ 8155998 end SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2 - specialval RESULT, 265 + specialval RESULT, CheckLeadMonCool compare RESULT, 1 callif 1, SlateportCity_PokemonFanClub_EventScript_1559B3 return @@ -154,7 +154,7 @@ SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 return SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 - specialval RESULT, 266 + specialval RESULT, CheckLeadMonBeauty compare RESULT, 1 callif 1, SlateportCity_PokemonFanClub_EventScript_1559CA return @@ -164,7 +164,7 @@ SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA return SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 - specialval RESULT, 267 + specialval RESULT, CheckLeadMonCute compare RESULT, 1 callif 1, SlateportCity_PokemonFanClub_EventScript_1559E1 return @@ -174,7 +174,7 @@ SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 return SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 - specialval RESULT, 268 + specialval RESULT, CheckLeadMonSmart compare RESULT, 1 callif 1, SlateportCity_PokemonFanClub_EventScript_1559F8 return @@ -184,7 +184,7 @@ SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 return SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE - specialval RESULT, 269 + specialval RESULT, CheckLeadMonTough compare RESULT, 1 callif 1, SlateportCity_PokemonFanClub_EventScript_155A0F return @@ -199,7 +199,7 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 checkflag 278 jumpeq SlateportCity_PokemonFanClub_EventScript_155A75 msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4 - specialval RESULT, 230 + specialval RESULT, GetLeadMonFriendshipScore compare RESULT, 4 jumpif 4, SlateportCity_PokemonFanClub_EventScript_155A3A release diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 3d9c2dc93..0c22fbc37 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -91,7 +91,7 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F lock faceplayer checkdailyflags - special 148 + special GetPlayerBigGuyGirlString checkflag 2258 jumpeq SootopolisCity_EventScript_14D241 msgbox SootopolisCity_Text_1C63F2, 4 diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index e28ab4547..32bf4d619 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -15,7 +15,7 @@ SootopolisCity_Gym_1F_MapScript1_15AF22:: @ 815AF22 SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 call SootopolisCity_Gym_1F_EventScript_15AF2E - special 309 + special sub_8069D78 end SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E @@ -51,7 +51,7 @@ SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 pause 40 playsfx 40 call SootopolisCity_Gym_1F_EventScript_15AF2E - special 142 + special DrawWholeMapView end SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC @@ -59,7 +59,7 @@ SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC pause 40 playsfx 40 call SootopolisCity_Gym_1F_EventScript_15AF2E - special 142 + special DrawWholeMapView end SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0 @@ -67,7 +67,7 @@ SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0 pause 40 playsfx 40 call SootopolisCity_Gym_1F_EventScript_15AF2E - special 142 + special DrawWholeMapView end SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index c52965124..9d7618316 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -2,16 +2,16 @@ SootopolisCity_House8_MapScripts:: @ 815B400 .byte 0 SootopolisCity_House8_EventScript_15B401:: @ 815B401 - special 119 + special GetShroomishSizeRecordInfo lock faceplayer msgbox SootopolisCity_House8_Text_1900F7, 4 - special 159 + special sub_80F9A0C waitstate copyvar RESULT, 0x8004 compare RESULT, 255 jumpeq SootopolisCity_House8_EventScript_15B448 - special 120 + special CompareShroomishSize compare RESULT, 1 jumpeq SootopolisCity_House8_EventScript_15B452 compare RESULT, 2 @@ -51,16 +51,16 @@ SootopolisCity_House8_EventScript_15B488:: @ 815B488 end SootopolisCity_House8_EventScript_15B492:: @ 815B492 - special 121 + special GetBarboachSizeRecordInfo lock faceplayer msgbox SootopolisCity_House8_Text_190431, 4 - special 159 + special sub_80F9A0C waitstate copyvar RESULT, 0x8004 compare RESULT, 255 jumpeq SootopolisCity_House8_EventScript_15B4D9 - special 122 + special CompareBarboachSize compare RESULT, 1 jumpeq SootopolisCity_House8_EventScript_15B4E3 compare RESULT, 2 @@ -100,14 +100,14 @@ SootopolisCity_House8_EventScript_15B519:: @ 815B519 end SootopolisCity_House8_EventScript_15B523:: @ 815B523 - special 119 + special GetShroomishSizeRecordInfo lockall msgbox SootopolisCity_House8_Text_1903C9, 4 releaseall end SootopolisCity_House8_EventScript_15B531:: @ 815B531 - special 121 + special GetBarboachSizeRecordInfo lockall msgbox SootopolisCity_House8_Text_1906BE, 4 releaseall diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index d3b944f29..3adf3545f 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -49,7 +49,7 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 checkflag 2131 jumpif 0, SouthernIsland_Interior_EventScript_160C08 setflag 206 - special 275 + special SpawnCameraDummy move 127, SouthernIsland_Interior_Movement_160C12 waitmove 0 pause 50 @@ -63,11 +63,11 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 move 2, SouthernIsland_Interior_Movement_160C22 waitmove 0 pause 50 - special 276 + special RemoveCameraDummy setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW setflag 911 setflag 2145 - special 323 + special StartBattle_SouthernIsland waitstate clearflag 2145 releaseall diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index f4f1fe61c..cbd782f35 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -12,7 +12,7 @@ LinkContestRoom1_MapScript1_15F595:: @ 815F595 end LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 - special 326 + special ScriptGetMultiplayerId compare RESULT, 0 callif 1, LinkContestRoom1_EventScript_15F5E0 compare RESULT, 1 @@ -127,7 +127,7 @@ LinkContestRoom1_EventScript_15F6DB:: @ 815F6DB LinkContestRoom1_EventScript_15F6E6:: @ 815F6E6 setvar RESULT, 32 - special 340 + special ScriptRandom addvar RESULT, 1 switch RESULT case 1, LinkContestRoom1_EventScript_15F859 diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 066ecbdce..8fd4016d1 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -11,7 +11,7 @@ VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 setvar CONTEST_RANK, 0 call VerdanturfTown_ContestLobby_EventScript_1A4E92 call VerdanturfTown_ContestLobby_EventScript_153DA1 - special 83 + special sub_80C4BF0 call VerdanturfTown_ContestLobby_EventScript_15FBDB setvar 0x4088, 1 warp LinkContestRoom1, 255, 7, 5 @@ -25,13 +25,13 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 playsfx 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 - special 142 + special DrawWholeMapView move 1, VerdanturfTown_ContestLobby_Movement_153E28 waitmove 0 playsfx 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 - special 142 + special DrawWholeMapView pause 20 move 1, VerdanturfTown_ContestLobby_Movement_153E35 waitmove 0 @@ -122,7 +122,7 @@ VerdanturfTown_ContestLobby_EventScript_153E80:: @ 8153E80 VerdanturfTown_ContestLobby_EventScript_153E89:: @ 8153E89 lockall - special 259 + special ShowBerryBlenderRecordWindow waitbutton hidebox 0, 0, 29, 19 releaseall diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc index 2dc2e1355..5453fb42c 100644 --- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc @@ -5,7 +5,7 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_154030:: @ 8154030 lock faceplayer msgbox VerdanturfTown_FriendshipRatersHouse_Text_178A9C, 4 - specialval RESULT, 230 + specialval RESULT, GetLeadMonFriendshipScore switch RESULT case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_154093 case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_15409D diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index b1f6e732b..f64ca20ab 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -93,7 +93,7 @@ VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 trainerbattle 0, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 - specialval RESULT, 57 + specialval RESULT, sub_8082C68 compare RESULT, 1 jumpeq VictoryRoad_1F_EventScript_15DF58 msgbox VictoryRoad_1F_Text_197A47, 6 diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 15d4b2a40..5fd68beca 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -44,7 +44,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1:: @ 81B1BB1 PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB:: @ 81B1BBB setvar 0x8004, 0 - special 96 + special sub_80EB7C4 waittext pause 80 msgbox PetalburgCity_PokemonCenter_1F_Text_1B2137, 4 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 9db432c2c..ca4b2bdb9 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -107,14 +107,14 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61 LittlerootTown_BrendansHouse_2F_EventScript_1B6A91:: @ 81B6A91 inccounter GAME_STAT_CHECKED_CLOCK fadescreen 1 - special 155 + special sub_810D6B8 waitstate releaseall end LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B:: @ 81B6A9B fadescreen 1 - special 154 + special StartWallClock waitstate return @@ -221,7 +221,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE waitmove 0 msgbox LittlerootTown_BrendansHouse_1F_Text_172841, 4 fadedefault - special 62 + special TurnOffTVScreen setflag 2096 pause 35 return diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 2cb283173..e1add8734 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -49,11 +49,11 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 checkitem ITEM_POKEBLOCK_CASE, 1 compare RESULT, 0 jumpeq FallarborTown_ContestLobby_EventScript_1B7780 - specialval RESULT, 49 + specialval RESULT, PlayerHasBerries compare RESULT, 0 jumpeq FallarborTown_ContestLobby_EventScript_1B770E msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 - specialval RESULT, 160 + specialval RESULT, sub_810CA00 compare RESULT, 65535 jumpif 5, FallarborTown_ContestLobby_EventScript_1B76EF compare RESULT, 65535 @@ -94,7 +94,7 @@ FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734 FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742 copyvar 0x8004, 0x8009 fadescreen 1 - special 161 + special sub_804E538 waitstate releaseall end @@ -148,7 +148,7 @@ VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6 lock faceplayer msgbox FallarborTown_ContestLobby_Text_1B742F, 4 - specialval RESULT, 49 + specialval RESULT, PlayerHasBerries compare RESULT, 1 jumpeq FallarborTown_ContestLobby_EventScript_1B77DC compare RESULT, 0 @@ -208,13 +208,13 @@ LilycoveCity_ContestLobby_EventScript_1B783B:: @ 81B783B SlateportCity_ContestLobby_EventScript_1B783B:: @ 81B783B VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B lockall - specialval RESULT, 49 + specialval RESULT, PlayerHasBerries compare RESULT, 0 jumpeq FallarborTown_ContestLobby_EventScript_1B7897 checkitem ITEM_POKEBLOCK_CASE, 1 compare RESULT, 0 jumpeq FallarborTown_ContestLobby_EventScript_1B7942 - specialval RESULT, 160 + specialval RESULT, sub_810CA00 compare RESULT, 65535 jumpif 5, FallarborTown_ContestLobby_EventScript_1B7878 compare RESULT, 65535 @@ -240,7 +240,7 @@ FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1 jumpeq FallarborTown_ContestLobby_EventScript_1B7936 message FallarborTown_ContestLobby_Text_1B7304 waittext - special 36 + special sub_8083614 waitstate compare RESULT, 1 jumpeq FallarborTown_ContestLobby_EventScript_1B7980 @@ -276,7 +276,7 @@ FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D disappear 239 disappear 238 disappear 237 - special 161 + special sub_804E538 waitstate releaseall end @@ -296,35 +296,35 @@ FallarborTown_ContestLobby_EventScript_1B7942:: @ 81B7942 end FallarborTown_ContestLobby_EventScript_1B794C:: @ 81B794C - special 31 + special CloseLink msgbox FallarborTown_ContestLobby_Text_1A4A30, 4 releaseall end FallarborTown_ContestLobby_EventScript_1B7959:: @ 81B7959 - special 31 + special CloseLink msgbox FallarborTown_ContestLobby_Text_1A4B1D, 4 releaseall end FallarborTown_ContestLobby_EventScript_1B7966:: @ 81B7966 - special 31 + special CloseLink msgbox FallarborTown_ContestLobby_Text_1A10EB, 4 releaseall end FallarborTown_ContestLobby_EventScript_1B7973:: @ 81B7973 - special 31 + special CloseLink msgbox FallarborTown_ContestLobby_Text_1A4A85, 4 releaseall end FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980 fadescreen 1 - specialval RESULT, 37 + specialval RESULT, GetLinkPartnerNames copyvar 0x8008, RESULT copyvar 0x8004, 0x8008 - special 38 + special SpawnBerryBlenderLinkPlayerSprites jump FallarborTown_ContestLobby_EventScript_1B799A end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index c8d519038..03293115b 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,12 +1,12 @@ gUnknown_081C340A:: @ 81C340A setvar 0x40a4, 1 - special 206 + special ExitSafariMode warp3 Route121_SafariZoneEntrance, 255, 2, 5 end EventScript_1C341B: @ 81C341B setvar 0x40a4, 1 - special 206 + special ExitSafariMode warp Route121_SafariZoneEntrance, 255, 2, 5 waitstate end @@ -42,7 +42,7 @@ gUnknown_081C3459:: @ 81C3459 gUnknown_081C346A:: @ 81C346A lockall - special 207 + special SafariZoneGetPokeblockNameInFeeder compare RESULT, -1 jumpif 5, EventScript_1C34A9 msgbox UnknownString_81C354E, 5 @@ -53,7 +53,7 @@ gUnknown_081C346A:: @ 81C346A EventScript_1C348E: fadescreen 1 - special 208 + special sub_810BAF4 waitstate compare RESULT, -1 jumpif 5, EventScript_1C34A0 diff --git a/data/scripts/storyteller.inc b/data/scripts/storyteller.inc index c44480e2f..eba94e698 100644 --- a/data/scripts/storyteller.inc +++ b/data/scripts/storyteller.inc @@ -8,22 +8,22 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B0816:: @ 81B0816 msgbox MauvilleCity_PokemonCenter_1F_Text_1AECC6, 5 compare RESULT, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 - specialval RESULT, 107 + specialval RESULT, sub_80F889C compare RESULT, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B08D3 MauvilleCity_PokemonCenter_1F_EventScript_1B084F:: @ 81B084F message MauvilleCity_PokemonCenter_1F_Text_1AED35 waittext - special 109 + special sub_80F8874 waitstate compare RESULT, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0883 setvar 0x8008, 1 - special 108 + special sub_80F8888 waittext waitbutton - specialval RESULT, 110 + specialval RESULT, sub_80F88AC compare RESULT, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0893 jump MauvilleCity_PokemonCenter_1F_EventScript_1B0909 @@ -40,10 +40,10 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B0893:: @ 81B0893 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B084F MauvilleCity_PokemonCenter_1F_EventScript_1B08AE:: @ 81B08AE - specialval RESULT, 112 + specialval RESULT, sub_80F88E0 compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F - specialval RESULT, 107 + specialval RESULT, sub_80F889C compare RESULT, 4 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F jump MauvilleCity_PokemonCenter_1F_EventScript_1B08DB @@ -55,7 +55,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B08DB:: @ 81B08DB msgbox MauvilleCity_PokemonCenter_1F_Text_1AEEB4, 5 compare RESULT, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 - specialval RESULT, 111 + specialval RESULT, sub_80F88FC compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0909 msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF49, 4 diff --git a/data/scripts/trader.inc b/data/scripts/trader.inc index b3a302516..b52c8a2dc 100644 --- a/data/scripts/trader.inc +++ b/data/scripts/trader.inc @@ -4,7 +4,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AEBAB:: @ 81AEBAB msgbox MauvilleCity_PokemonCenter_1F_Text_1AE88F, 5 compare RESULT, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA - special 114 + special sub_8109C44 compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3 message MauvilleCity_PokemonCenter_1F_Text_1AE910 @@ -21,7 +21,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3:: @ 81AEBE3 end MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC:: @ 81AEBEC - special 113 + special sub_8109E34 waitstate compare 0x8004, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D @@ -30,7 +30,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC:: @ 81AEBEC msgbox MauvilleCity_PokemonCenter_1F_Text_1AE97C, 5 compare RESULT, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC42 - special 115 + special sub_8109C58 compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 @@ -58,19 +58,19 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E:: @ 81AEC4E MauvilleCity_PokemonCenter_1F_EventScript_1AEC57:: @ 81AEC57 msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9F8, 4 - special 117 + special sub_8109CF0 waitstate compare 0x8006, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECA6 compare 0x8006, 65535 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECAF - special 116 + special sub_8109C90 compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECBD msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA9B, 5 compare RESULT, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 - special 118 + special sub_8109DE0 msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAFB, 2 end diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 2b317e725..1f8956811 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -1,8 +1,8 @@ Event_TV:: @ 81A6E72 lockall inccounter GAME_STAT_WATCHED_TV - special 75 - specialval RESULT, 73 + special sub_80C2014 + specialval RESULT, CheckForBigMovieOrEmergencyNewsOnTV compare RESULT, 2 jumpeq EventScript_1A6F01 compare RESULT, 1 @@ -11,29 +11,29 @@ Event_TV:: @ 81A6E72 jumpif 0, EventScript_1A6EF1 checkflag 2097 jumpeq EventScript_1A6EF1 - specialval RESULT, 176 + specialval RESULT, IsTVShowInSearchOfTrainersAiring compare RESULT, 1 jumpeq EventScript_1A6F66 jump EventScript_1A6F50 end EventScript_1A6EBB: - specialval 0x8004, 65 + specialval 0x8004, special_0x44 compare 0x8004, 255 jumpeq EventScript_1A6F3F - specialval RESULT, 71 + specialval RESULT, special_0x4a compare RESULT, 255 jumpeq EventScript_1A6F3F copyvar 0x8004, RESULT - specialval RESULT, 66 + specialval RESULT, sub_80BDA0C compare RESULT, 0 jumpif 5, EventScript_1A6F21 end EventScript_1A6EF1: - special 74 + special GetMomOrDadStringForTVMessage msgbox UnknownString_81A0E68, 4 - special 62 + special TurnOffTVScreen releaseall end @@ -48,15 +48,15 @@ EventScript_1A6F0B: .else msgbox UnknownString_8172C50, 4 .endif - special 297 + special InitRoamer clearflag 2141 setflag 255 - special 62 + special TurnOffTVScreen releaseall end EventScript_1A6F21: - special 63 + special DoTVShow waittext waitbutton compare RESULT, 1 @@ -65,19 +65,19 @@ EventScript_1A6F21: end EventScript_1A6F37: - special 62 + special TurnOffTVScreen setflag 2097 releaseall end EventScript_1A6F3F: - special 74 + special GetMomOrDadStringForTVMessage msgbox UnknownString_81A0E68, 4 jump EventScript_1A6F37 end EventScript_1A6F50: - special 64 + special sub_80BECE8 compare RESULT, 0 jumpeq EventScript_1A6EBB waittext @@ -86,7 +86,7 @@ EventScript_1A6F50: end EventScript_1A6F66: - special 175 + special DoTVShowInSearchOfTrainers waittext waitbutton compare RESULT, 0 diff --git a/data/specials.inc b/data/specials.inc index f7aa3456a..0eb6b742d 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -1,347 +1,354 @@ +.macro def_special ptr +.set SPECIAL_\ptr, __special__ +.set __special__, __special__ + 1 + .4byte \ptr + .endm + +.set __special__, 0 .align 2 gSpecials:: - .4byte HealPlayerParty - .4byte sub_8068FEC - .4byte sub_808102C - .4byte sub_80810DC - .4byte sub_80839A4 - .4byte sub_80839D0 - .4byte sub_80BB8CC - .4byte sub_80BB63C - .4byte sub_80BBAF0 - .4byte sub_80BC440 - .4byte SecretBasePC_PackUp - .4byte sub_80BC114 - .4byte sub_80BC56C - .4byte sub_80BC5BC - .4byte SecretBasePC_Decoration - .4byte SecretBasePC_Registry - .4byte sub_80BCE1C - .4byte sub_80BCE90 - .4byte sub_80BBDD0 - .4byte sub_80FF474 - .4byte sub_8100B20 - .4byte sub_80BB70C - .4byte sub_80BBFA4 - .4byte sub_8100A7C - .4byte sub_80BBC78 - .4byte sub_80BCE4C - .4byte sub_80C683C - .4byte sub_80B929C - .4byte sub_808347C - .4byte sub_80834E4 - .4byte sub_808350C - .4byte CloseLink - .4byte sub_8083B90 - .4byte sub_8083B5C - .4byte sub_8083B80 - .4byte sub_8083820 - .4byte sub_8083614 - .4byte GetLinkPartnerNames - .4byte SpawnBerryBlenderLinkPlayerSprites - .4byte SavePlayerParty - .4byte LoadPlayerParty - .4byte sub_80C5568 - .4byte sub_8083BDC - .4byte FieldObjectInteractionGetBerryTreeData - .4byte sub_80B4EE4 - .4byte FieldObjectInteractionPlantBerryTree - .4byte FieldObjectInteractionPickBerryTree - .4byte FieldObjectInteractionRemoveBerryTree - .4byte FieldObjectInteractionWaterBerryTree - .4byte PlayerHasBerries - .4byte IsEnigmaBerryValid - .4byte sub_8082558 - .4byte sub_80826D8 - .4byte sub_8082718 - .4byte sub_8082564 - .4byte sub_80847C8 - .4byte PlayTrainerEncounterMusic - .4byte sub_8082C68 - .4byte sub_8082C9C - .4byte sub_80826B0 - .4byte ShowPokemonStorageSystem - .4byte CheckForAlivePartyMons - .4byte TurnOffTVScreen - .4byte DoTVShow - .4byte sub_80BECE8 - .4byte special_0x44 - .4byte sub_80BDA0C - .4byte sub_80BF2C4 - .4byte sub_80BDE48 - .4byte sub_80BF544 - .4byte SetContestCategoryStringVarForInterview - .4byte special_0x4a - .4byte sub_80BF974 - .4byte CheckForBigMovieOrEmergencyNewsOnTV - .4byte GetMomOrDadStringForTVMessage - .4byte sub_80C2014 - .4byte sub_80C47C0 - .4byte sub_80C496C - .4byte sub_80C4C28 - .4byte sub_80C47F0 - .4byte sub_80C4858 - .4byte sub_80C4C64 - .4byte sub_80C4758 - .4byte sub_80C4BF0 - .4byte sub_80C43F4 - .4byte sub_80C4D80 - .4byte sub_80C4F70 - .4byte sub_80C47A0 - .4byte sub_80C4440 - .4byte sub_80C44C0 - .4byte sub_80C5044 - .4byte GiveMonArtistRibbon - .4byte sub_808363C - .4byte InitSaveDialog - .4byte DoWateringBerryTreeAnim - .4byte sub_80E60D8 - .4byte sub_80EB7C4 - .4byte sub_80F7B14 - .4byte sub_80F7B2C - .4byte sub_80F7B40 - .4byte sub_80F7C70 - .4byte sub_80F7C84 - .4byte sub_80F7C90 - .4byte sub_80F7C54 - .4byte sub_80F83D0 - .4byte sub_80F7CF4 - .4byte sub_80F7CC8 - .4byte sub_80F889C - .4byte sub_80F8888 - .4byte sub_80F8874 - .4byte sub_80F88AC - .4byte sub_80F88FC - .4byte sub_80F88E0 - .4byte sub_8109E34 - .4byte sub_8109C44 - .4byte sub_8109C58 - .4byte sub_8109C90 - .4byte sub_8109CF0 - .4byte sub_8109DE0 - .4byte GetShroomishSizeRecordInfo - .4byte CompareShroomishSize - .4byte GetBarboachSizeRecordInfo - .4byte CompareBarboachSize - .4byte sub_80BF9B4 - .4byte sub_80BFAE0 - .4byte sub_80BFB10 - .4byte sub_80FA5BC - .4byte sub_80FA5E4 - .4byte sub_80EB83C - .4byte sub_80FA648 - .4byte SwapRegisteredBike - .4byte CalculatePlayerPartyCount - .4byte sub_8095B6C - .4byte sub_8095C10 - .4byte sub_80C4CF8 - .4byte sub_80C4CEC - .4byte sub_80C4C78 - .4byte sub_80C4D50 - .4byte ShowContestWinner - .4byte MauvilleGymSpecial2 - .4byte MauvilleGymSpecial1 - .4byte ShowFieldMessageStringVar4 - .4byte DrawWholeMapView - .4byte StorePlayerCoordsInVars - .4byte MauvilleGymSpecial3 - .4byte PetalburgGymSpecial1 - .4byte PetalburgGymSpecial2 - .4byte GetPlayerTrainerIdOnesDigit - .4byte GetPlayerBigGuyGirlString - .4byte GetRivalSonDaughterString - .4byte SetFlagInVar - .4byte CableCarWarp - .4byte sub_8123218 - .4byte sub_8053E90 - .4byte StartWallClock - .4byte sub_810D6B8 - .4byte ChooseStarter - .4byte StartBattle_WallyTutorial - .4byte sub_80BF9F8 - .4byte sub_80F9A0C - .4byte sub_810CA00 - .4byte sub_804E538 - .4byte PlayRoulette - .4byte sub_810FD60 - .4byte sub_810FCB0 - .4byte sub_810FDAC - .4byte sub_810FA74 - .4byte sub_810FCE8 - .4byte sub_810FF48 - .4byte sub_810FAA0 - .4byte sub_810FF60 - .4byte RockSmashWildEncounter - .4byte GabbyAndTyGetBattleNum - .4byte sub_80BDC14 - .4byte GabbyAndTyBeforeInterview - .4byte DoTVShowInSearchOfTrainers - .4byte IsTVShowInSearchOfTrainersAiring - .4byte GabbyAndTyGetLastQuote - .4byte sub_80BDD18 - .4byte GabbyAndTySetScriptVarsToFieldObjectLocalIds - .4byte sub_810E300 - .4byte sp0B5_daycare - .4byte sp0B6_daycare - .4byte sub_8041E7C - .4byte sp0B8_daycare - .4byte sp0B9_daycare_relationship_comment - .4byte sub_8042328 - .4byte Daycare_SendPokemon_Special - .4byte ChooseSendDaycareMon - .4byte ShowDaycareLevelMenu - .4byte sub_80417B8 - .4byte sub_8041770 - .4byte sub_8041648 - .4byte ScriptHatchMon - .4byte EggHatch - .4byte sub_8042B4C - .4byte ShowLinkBattleRecords - .4byte sub_80B7CE8 - .4byte sub_80B7D0C - .4byte ExecuteWhiteOut - .4byte sp0C8_whiteout_maybe - .4byte RotatingGate_InitPuzzle - .4byte RotatingGate_InitPuzzleAndGraphics - .4byte SetSSTidalFlag - .4byte ResetSSTidalFlag - .4byte EnterSafariMode - .4byte ExitSafariMode - .4byte SafariZoneGetPokeblockNameInFeeder - .4byte sub_810BAF4 - .4byte IsMirageIslandPresent - .4byte UpdateShoalTideFlag - .4byte InitBirchState - .4byte ScriptGetPokedexInfo - .4byte ShowPokedexRatingMessage - .4byte DoPCTurnOnEffect - .4byte DoPCTurnOffEffect - .4byte SetDepartmentStoreFloorVar - .4byte DoLotteryCornerComputerEffect - .4byte EndLotteryCornerComputerEffect - .4byte sub_80F9A4C - .4byte sub_80F9EEC - .4byte sub_80FA0DC - .4byte sub_80F9F84 - .4byte sub_80F9F3C - .4byte sub_8132670 - .4byte GetRecordedCyclingRoadResults - .4byte BeginCyclingRoadChallenge - .4byte GetPlayerAvatarBike - .4byte FinishCyclingRoadChallenge - .4byte UpdateCyclingRoadState - .4byte GetLeadMonFriendshipScore - .4byte sub_8134548 - .4byte sub_81347F8 - .4byte CheckPartyBattleTowerBanlist - .4byte sub_8135474 - .4byte sub_81360C0 - .4byte sub_813556C - .4byte sub_8135668 - .4byte sub_81358A4 - .4byte sub_8135A14 - .4byte sub_8135BA0 - .4byte sub_8135C38 - .4byte sub_8135D84 - .4byte sub_8135DEC - .4byte sub_8135E50 - .4byte ChooseBattleTowerPlayerParty - .4byte sub_813601C - .4byte sub_810F404 - .4byte ReducePlayerPartyToThree - .4byte BedroomPC - .4byte PlayerPC - .4byte FieldShowRegionMap - .4byte sub_804D89C - .4byte sub_804DB68 - .4byte sub_804E174 - .4byte sub_804DB2C - .4byte GetWeekCount - .4byte RetrieveLotteryNumber - .4byte PickLotteryCornerTicket - .4byte ShowBerryBlenderRecordWindow - .4byte ResetTrickHouseEndRoomFlag - .4byte SetTrickHouseEndRoomFlag - .4byte TryCreatePCMenu - .4byte AccessHallOfFamePC - .4byte sub_810D6A4 - .4byte CheckLeadMonCool - .4byte CheckLeadMonBeauty - .4byte CheckLeadMonCute - .4byte CheckLeadMonSmart - .4byte CheckLeadMonTough - .4byte sub_80C7958 - .4byte DoSoftReset - .4byte GameClear - .4byte sub_810EBEC - .4byte ShowGlassWorkshopMenu - .4byte SpawnCameraDummy - .4byte RemoveCameraDummy - .4byte GetPokeblockNameByMonNature - .4byte GetSecretBaseNearbyMapName - .4byte CheckRelicanthWailord - .4byte DoBrailleWait - .4byte sub_80818A4 - .4byte sub_80818FC - .4byte ShowBattleTowerRecords - .4byte WaitWeather - .4byte sub_810F414 - .4byte sub_810F424 - .4byte player_get_direction_lower_nybble - .4byte sub_810F488 - .4byte sub_810F4B0 - .4byte sub_810F4D4 - .4byte sub_810F4FC - .4byte LeadMonHasEffortRibbon - .4byte GivLeadMonEffortRibbon - .4byte GetLeadMonEVCount - .4byte sub_8064EAC - .4byte sub_8064ED4 - .4byte InitRoamer - .4byte sub_810F5BC - .4byte IsGrassTypeInParty - .4byte sub_8081334 - .4byte PutZigzagoonInPlayerParty - .4byte IsStarterInParty - .4byte sub_80BC224 - .4byte CheckFreePokemonStorageSpace - .4byte DoSealedChamberShakingEffect1 - .4byte sub_810E944 - .4byte GetShieldToyTVDecorationInfo - .4byte IsPokerusInParty - .4byte sub_8069D78 - .4byte sub_810F758 - .4byte StartBattle_GroudonKyogre - .4byte StartBattle_Rayquaza - .4byte StartBattle_Regi - .4byte sub_8082524 - .4byte DoSealedChamberShakingEffect2 - .4byte sub_810F828 - .4byte sub_807E25C - .4byte sp13E_warp_to_last_warp - .4byte sp13F_fall_to_last_warp - .4byte ShowContestEntryMonPic - .4byte sub_80C5164 - .4byte sub_8134AB4 - .4byte StartBattle_SouthernIsland - .4byte SetRoute119Weather - .4byte SetRoute123Weather - .4byte ScriptGetMultiplayerId - .4byte ScriptGetPartyMonSpecies - .4byte sub_80FA148 - .4byte sub_810F8FC - .4byte sub_80BC50C - .4byte LoadPlayerBag - .4byte sub_8081924 - .4byte sub_810F950 - .4byte sub_810F908 - .4byte sub_8090FC0 - .4byte sub_810F96C - .4byte sub_810F9AC - .4byte sub_813610C - .4byte GetNameOfEnigmaBerryInPlayerParty - .4byte ScriptRandom - .4byte sub_80835D8 + def_special HealPlayerParty + def_special SetCableClubWarp + def_special DoCableClubWarp + def_special sub_80810DC + def_special sub_80839A4 + def_special sub_80839D0 + def_special sub_80BB8CC + def_special sub_80BB63C + def_special sub_80BBAF0 + def_special sub_80BC440 + def_special SecretBasePC_PackUp + def_special sub_80BC114 + def_special sub_80BC56C + def_special sub_80BC5BC + def_special SecretBasePC_Decoration + def_special SecretBasePC_Registry + def_special sub_80BCE1C + def_special sub_80BCE90 + def_special sub_80BBDD0 + def_special sub_80FF474 + def_special sub_8100B20 + def_special sub_80BB70C + def_special sub_80BBFA4 + def_special sub_8100A7C + def_special sub_80BBC78 + def_special sub_80BCE4C + def_special sub_80C683C + def_special sub_80B929C + def_special sub_808347C + def_special sub_80834E4 + def_special sub_808350C + def_special CloseLink + def_special sub_8083B90 + def_special sub_8083B5C + def_special sub_8083B80 + def_special sub_8083820 + def_special sub_8083614 + def_special GetLinkPartnerNames + def_special SpawnBerryBlenderLinkPlayerSprites + def_special SavePlayerParty + def_special LoadPlayerParty + def_special sub_80C5568 + def_special sub_8083BDC + def_special FieldObjectInteractionGetBerryTreeData + def_special sub_80B4EE4 + def_special FieldObjectInteractionPlantBerryTree + def_special FieldObjectInteractionPickBerryTree + def_special FieldObjectInteractionRemoveBerryTree + def_special FieldObjectInteractionWaterBerryTree + def_special PlayerHasBerries + def_special IsEnigmaBerryValid + def_special sub_8082558 + def_special sub_80826D8 + def_special sub_8082718 + def_special sub_8082564 + def_special sub_80847C8 + def_special PlayTrainerEncounterMusic + def_special sub_8082C68 + def_special sub_8082C9C + def_special sub_80826B0 + def_special ShowPokemonStorageSystem + def_special CheckForAlivePartyMons + def_special TurnOffTVScreen + def_special DoTVShow + def_special sub_80BECE8 + def_special special_0x44 + def_special sub_80BDA0C + def_special sub_80BF2C4 + def_special sub_80BDE48 + def_special sub_80BF544 + def_special SetContestCategoryStringVarForInterview + def_special special_0x4a + def_special sub_80BF974 + def_special CheckForBigMovieOrEmergencyNewsOnTV + def_special GetMomOrDadStringForTVMessage + def_special sub_80C2014 + def_special sub_80C47C0 + def_special sub_80C496C + def_special sub_80C4C28 + def_special sub_80C47F0 + def_special sub_80C4858 + def_special sub_80C4C64 + def_special sub_80C4758 + def_special sub_80C4BF0 + def_special sub_80C43F4 + def_special sub_80C4D80 + def_special sub_80C4F70 + def_special sub_80C47A0 + def_special sub_80C4440 + def_special sub_80C44C0 + def_special sub_80C5044 + def_special GiveMonArtistRibbon + def_special sub_808363C + def_special InitSaveDialog + def_special DoWateringBerryTreeAnim + def_special sub_80E60D8 + def_special sub_80EB7C4 + def_special sub_80F7B14 + def_special sub_80F7B2C + def_special sub_80F7B40 + def_special sub_80F7C70 + def_special sub_80F7C84 + def_special sub_80F7C90 + def_special sub_80F7C54 + def_special sub_80F83D0 + def_special sub_80F7CF4 + def_special sub_80F7CC8 + def_special sub_80F889C + def_special sub_80F8888 + def_special sub_80F8874 + def_special sub_80F88AC + def_special sub_80F88FC + def_special sub_80F88E0 + def_special sub_8109E34 + def_special sub_8109C44 + def_special sub_8109C58 + def_special sub_8109C90 + def_special sub_8109CF0 + def_special sub_8109DE0 + def_special GetShroomishSizeRecordInfo + def_special CompareShroomishSize + def_special GetBarboachSizeRecordInfo + def_special CompareBarboachSize + def_special sub_80BF9B4 + def_special sub_80BFAE0 + def_special sub_80BFB10 + def_special sub_80FA5BC + def_special sub_80FA5E4 + def_special sub_80EB83C + def_special sub_80FA648 + def_special SwapRegisteredBike + def_special CalculatePlayerPartyCount + def_special sub_8095B6C + def_special sub_8095C10 + def_special sub_80C4CF8 + def_special sub_80C4CEC + def_special sub_80C4C78 + def_special sub_80C4D50 + def_special ShowContestWinner + def_special MauvilleGymSpecial2 + def_special MauvilleGymSpecial1 + def_special ShowFieldMessageStringVar4 + def_special DrawWholeMapView + def_special StorePlayerCoordsInVars + def_special MauvilleGymSpecial3 + def_special PetalburgGymSpecial1 + def_special PetalburgGymSpecial2 + def_special GetPlayerTrainerIdOnesDigit + def_special GetPlayerBigGuyGirlString + def_special GetRivalSonDaughterString + def_special SetFlagInVar + def_special CableCarWarp + def_special sub_8123218 + def_special sub_8053E90 + def_special StartWallClock + def_special sub_810D6B8 + def_special ChooseStarter + def_special StartBattle_WallyTutorial + def_special sub_80BF9F8 + def_special sub_80F9A0C + def_special sub_810CA00 + def_special sub_804E538 + def_special PlayRoulette + def_special sub_810FD60 + def_special sub_810FCB0 + def_special sub_810FDAC + def_special sub_810FA74 + def_special sub_810FCE8 + def_special sub_810FF48 + def_special sub_810FAA0 + def_special sub_810FF60 + def_special RockSmashWildEncounter + def_special GabbyAndTyGetBattleNum + def_special sub_80BDC14 + def_special GabbyAndTyBeforeInterview + def_special DoTVShowInSearchOfTrainers + def_special IsTVShowInSearchOfTrainersAiring + def_special GabbyAndTyGetLastQuote + def_special sub_80BDD18 + def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds + def_special sub_810E300 + def_special sp0B5_daycare + def_special sp0B6_daycare + def_special sub_8041E7C + def_special sp0B8_daycare + def_special sp0B9_daycare_relationship_comment + def_special sub_8042328 + def_special Daycare_SendPokemon_Special + def_special ChooseSendDaycareMon + def_special ShowDaycareLevelMenu + def_special sub_80417B8 + def_special sub_8041770 + def_special sub_8041648 + def_special ScriptHatchMon + def_special EggHatch + def_special sub_8042B4C + def_special ShowLinkBattleRecords + def_special sub_80B7CE8 + def_special sub_80B7D0C + def_special ExecuteWhiteOut + def_special sp0C8_whiteout_maybe + def_special RotatingGate_InitPuzzle + def_special RotatingGate_InitPuzzleAndGraphics + def_special SetSSTidalFlag + def_special ResetSSTidalFlag + def_special EnterSafariMode + def_special ExitSafariMode + def_special SafariZoneGetPokeblockNameInFeeder + def_special sub_810BAF4 + def_special IsMirageIslandPresent + def_special UpdateShoalTideFlag + def_special InitBirchState + def_special ScriptGetPokedexInfo + def_special ShowPokedexRatingMessage + def_special DoPCTurnOnEffect + def_special DoPCTurnOffEffect + def_special SetDepartmentStoreFloorVar + def_special DoLotteryCornerComputerEffect + def_special EndLotteryCornerComputerEffect + def_special sub_80F9A4C + def_special sub_80F9EEC + def_special sub_80FA0DC + def_special sub_80F9F84 + def_special sub_80F9F3C + def_special sub_8132670 + def_special GetRecordedCyclingRoadResults + def_special BeginCyclingRoadChallenge + def_special GetPlayerAvatarBike + def_special FinishCyclingRoadChallenge + def_special UpdateCyclingRoadState + def_special GetLeadMonFriendshipScore + def_special sub_8134548 + def_special sub_81347F8 + def_special CheckPartyBattleTowerBanlist + def_special sub_8135474 + def_special sub_81360C0 + def_special sub_813556C + def_special sub_8135668 + def_special sub_81358A4 + def_special sub_8135A14 + def_special sub_8135BA0 + def_special sub_8135C38 + def_special sub_8135D84 + def_special sub_8135DEC + def_special sub_8135E50 + def_special ChooseBattleTowerPlayerParty + def_special sub_813601C + def_special sub_810F404 + def_special ReducePlayerPartyToThree + def_special BedroomPC + def_special PlayerPC + def_special FieldShowRegionMap + def_special sub_804D89C + def_special sub_804DB68 + def_special sub_804E174 + def_special sub_804DB2C + def_special GetWeekCount + def_special RetrieveLotteryNumber + def_special PickLotteryCornerTicket + def_special ShowBerryBlenderRecordWindow + def_special ResetTrickHouseEndRoomFlag + def_special SetTrickHouseEndRoomFlag + def_special TryCreatePCMenu + def_special AccessHallOfFamePC + def_special sub_810D6A4 + def_special CheckLeadMonCool + def_special CheckLeadMonBeauty + def_special CheckLeadMonCute + def_special CheckLeadMonSmart + def_special CheckLeadMonTough + def_special sub_80C7958 + def_special DoSoftReset + def_special GameClear + def_special sub_810EBEC + def_special ShowGlassWorkshopMenu + def_special SpawnCameraDummy + def_special RemoveCameraDummy + def_special GetPokeblockNameByMonNature + def_special GetSecretBaseNearbyMapName + def_special CheckRelicanthWailord + def_special DoBrailleWait + def_special sub_80818A4 + def_special sub_80818FC + def_special ShowBattleTowerRecords + def_special WaitWeather + def_special sub_810F414 + def_special sub_810F424 + def_special player_get_direction_lower_nybble + def_special sub_810F488 + def_special sub_810F4B0 + def_special sub_810F4D4 + def_special sub_810F4FC + def_special LeadMonHasEffortRibbon + def_special GivLeadMonEffortRibbon + def_special GetLeadMonEVCount + def_special sub_8064EAC + def_special sub_8064ED4 + def_special InitRoamer + def_special sub_810F5BC + def_special IsGrassTypeInParty + def_special sub_8081334 + def_special PutZigzagoonInPlayerParty + def_special IsStarterInParty + def_special sub_80BC224 + def_special CheckFreePokemonStorageSpace + def_special DoSealedChamberShakingEffect1 + def_special sub_810E944 + def_special GetShieldToyTVDecorationInfo + def_special IsPokerusInParty + def_special sub_8069D78 + def_special sub_810F758 + def_special StartBattle_GroudonKyogre + def_special StartBattle_Rayquaza + def_special StartBattle_Regi + def_special sub_8082524 + def_special DoSealedChamberShakingEffect2 + def_special sub_810F828 + def_special sub_807E25C + def_special sp13E_warp_to_last_warp + def_special sp13F_fall_to_last_warp + def_special ShowContestEntryMonPic + def_special sub_80C5164 + def_special sub_8134AB4 + def_special StartBattle_SouthernIsland + def_special SetRoute119Weather + def_special SetRoute123Weather + def_special ScriptGetMultiplayerId + def_special ScriptGetPartyMonSpecies + def_special sub_80FA148 + def_special sub_810F8FC + def_special sub_80BC50C + def_special LoadPlayerBag + def_special sub_8081924 + def_special sub_810F950 + def_special sub_810F908 + def_special sub_8090FC0 + def_special sub_810F96C + def_special sub_810F9AC + def_special sub_813610C + def_special GetNameOfEnigmaBerryInPlayerParty + def_special ScriptRandom + def_special sub_80835D8 .ifdef GERMAN - .4byte nullsub_814B200 + def_special nullsub_814B200 .endif diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index a4f52f4b9..e791e0418 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -863,7 +863,7 @@ u8 *GetFieldObjectScriptPointerForComparison(void) return sub_8068364(&position, MapGridGetMetatileBehaviorAt(position.x, position.y), r4); } -int sub_8068FEC(void) +int SetCableClubWarp(void) { struct MapPosition position; |